Skip to content

Commit

Permalink
Merge pull request #25 from PromiseKit/swift-5.1
Browse files Browse the repository at this point in the history
Swift 5.1
  • Loading branch information
mxcl authored Oct 11, 2019
2 parents ee06d95 + 9916671 commit 1a276e5
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 7 deletions.
21 changes: 16 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
osx_image: xcode8.3
env: SWIFT=3.1
before_install:
gem install cocoapods --prerelease --version 1.7.0.beta.3
gem install cocoapods --version '~> 1.8.0'
install:
carthage bootstrap --no-build PromiseKit
script: |
Expand Down Expand Up @@ -47,7 +47,10 @@ jobs:
- <<: *pod
osx_image: xcode10.2
env: SWIFT=5.0

- <<: *pod
osx_image: xcode11
env: SWIFT=5.1

- &linux
stage: swiftpm
env: SWIFT_BUILD_VERSION=3 SWIFT_VERSION=4.0
Expand Down Expand Up @@ -86,7 +89,10 @@ jobs:
- <<: *linux
env: SWIFT_BUILD_VERSION=5 SWIFT_VERSION=5.0
name: Linux / Swift 5.0

- <<: *linux
env: SWIFT_BUILD_VERSION=5 SWIFT_VERSION=5.1
name: Linux / Swift 5.1

- &swiftpm
stage: swiftpm
name: Xcode 8.3 / SwiftPM
Expand All @@ -100,7 +106,10 @@ jobs:
- <<: *swiftpm
name: Xcode 10.0 / SwiftPM
osx_image: xcode10

- <<: *swiftpm
name: Xcode 11.0 / SwiftPM
osx_image: xcode11

- &carthage
stage: carthage
osx_image: xcode9.2
Expand All @@ -117,7 +126,9 @@ jobs:
osx_image: xcode10.1
- <<: *carthage
osx_image: xcode10.2

- <<: *carthage
osx_image: xcode11

- &test
stage: test
xcode_scheme: PMKFoundation
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "AliSoftware/OHHTTPStubs" "7.0.0"
github "mxcl/PromiseKit" "6.8.4"
github "mxcl/PromiseKit" "6.11.0"
2 changes: 1 addition & 1 deletion Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"repositoryURL": "https://github.com/mxcl/PromiseKit.git",
"state": {
"branch": null,
"revision": "e0176e7886b3bef5b9a546bcc6b357f6f569f222",
"revision": "fe1e9c5b62465227cceb7b0e6e79489ba7b824af",
"version": "6.8.4"
}
}
Expand Down
5 changes: 5 additions & 0 deletions Sources/NSURLSession+Promise.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ import Foundation
#if !PMKCocoaPods
import PromiseKit
#endif
#if swift(>=4.1)
#if canImport(FoundationNetworking)
import FoundationNetworking
#endif
#endif

/**
To import the `NSURLSession` category:
Expand Down

0 comments on commit 1a276e5

Please sign in to comment.