close
Skip to content
This repository was archived by the owner on Aug 29, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,33 @@
matrix:
include:
- env: JOB=macOS
- language: objective-c
os: osx
osx_image: xcode9.2
language: objective-c
osx_image: xcode9.4
install: bundle install --quiet
script: bundle exec fastlane mac ci
- env: JOB=iOS
- language: objective-c
os: osx
osx_image: xcode9.3
language: objective-c
osx_image: xcode10.0
install: bundle install --quiet
script: bundle exec fastlane ios ci
after_failure:
- cat ~/Library/Developer/Xcode/DerivedData/Deferred-*/Logs/Test/*/Session-MobileDeferredTests-*.log | true
- cat ~/Library/Logs/scan/Deferred-*.log | true
- env: JOB=Linux SWIFT=4.0
- language: generic
os: linux
dist: trusty
sudo: required
language: generic
install:
- echo "4.0" > .swift-version
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
env: SWIFT_VERSION=4.1
install: eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
script:
- swift --version
- swift test --parallel
- env: JOB=Linux SWIFT=4.1
- language: generic
os: linux
dist: trusty
sudo: required
language: generic
install:
- echo "4.1" > .swift-version
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
env: SWIFT_VERSION=4.2-DEVELOPMENT-SNAPSHOT-2018-09-14-a
install: eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
script:
- swift --version
- swift test --parallel
Expand Down
3 changes: 2 additions & 1 deletion Documentation/Guide/Getting Started.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ Then run `pod install`.

### Swift Package Manager

We include support for [Swift Package Manager](https://swift.org/package-manager/) on 3.x toolchains.
We include support for [Swift Package Manager](https://swift.org/package-manager/) on 4.1 or greater toolchains.

Add us to your `Package.swift`:

```swift
// swift-tools-version:4.0
import PackageDescription

let package = Package(
Expand Down
5 changes: 2 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.0
// swift-tools-version:4.1

//
// Package.swift
Expand Down Expand Up @@ -31,5 +31,4 @@ let package = Package(
name: "TaskTests",
dependencies: [ "Deferred", "Task" ],
exclude: [ "Tests/AllTestsCommon.swift" ])
],
swiftLanguageVersions: [ 4 ])
])
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Deferred is a "futures library", probably like ones you've already heard about.

| |
|--------------------------------------------------------------------------------------------------------|
|[![Swift 3.x](https://img.shields.io/badge/swift-4.x-EF5138.svg)][Swift] |
|[![Requires Swift 4.1 or greater](https://img.shields.io/badge/swift-4.1%2B-EF5138.svg)][Swift] |
|[![Under MIT License](https://img.shields.io/badge/license-MIT-blue.svg)][MIT] |
|![Multiplatform](https://img.shields.io/badge/platforms-macOS,_iOS,_watchOS,_tvOS,_Linux-lightgrey.svg) |
|[![Travis CI](https://img.shields.io/travis/bignerdranch/Deferred.svg)][CI] |
Expand Down