Merge pull request #1079 from mxcl/xcode11
Xcode 11 / Swift 5.1 support
This commit is contained in:
commit
8e5f5d0945
2
.github/PromiseKit.podspec
vendored
2
.github/PromiseKit.podspec
vendored
@ -19,7 +19,7 @@ Pod::Spec.new do |s|
|
||||
s.default_subspecs = 'CorePromise', 'UIKit', 'Foundation'
|
||||
s.requires_arc = true
|
||||
|
||||
s.swift_versions = ['3.1', '3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0']
|
||||
s.swift_versions = ['3.1', '3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1']
|
||||
|
||||
# CocoaPods requires us to specify the root deployment targets
|
||||
# even though for us it is nonsense. Our root spec has no
|
||||
|
||||
12
.travis.yml
12
.travis.yml
@ -53,6 +53,9 @@ jobs:
|
||||
- <<: *carthage
|
||||
osx_image: xcode10.2
|
||||
name: Swift 4.1.51 / Xcode 10.2
|
||||
- <<: *carthage
|
||||
osx_image: xcode11
|
||||
name: Swift 4.1.52 / Xcode 10.2
|
||||
|
||||
- &pod
|
||||
stage: lint
|
||||
@ -86,6 +89,9 @@ jobs:
|
||||
- <<: *pod
|
||||
osx_image: xcode10.2
|
||||
env: SWIFT=5.0
|
||||
- <<: *pod
|
||||
osx_image: xcode11
|
||||
env: SWIFT=5.1
|
||||
|
||||
- &linux
|
||||
stage: swiftpm
|
||||
@ -124,6 +130,9 @@ jobs:
|
||||
env: SWIFT_BUILD_VERSION=5 SWIFT_VERSION=5.0
|
||||
name: 'Linux / Swift 5.0 / +Tests'
|
||||
script: swift test -Xswiftc -swift-version -Xswiftc $SWIFT_BUILD_VERSION
|
||||
- <<: *linux
|
||||
env: SWIFT_BUILD_VERSION=5 SWIFT_VERSION=5.1-DEVELOPMENT-SNAPSHOT-2019-07-03-a
|
||||
name: Linux / Swift 5.1
|
||||
|
||||
- &test
|
||||
stage: test
|
||||
@ -163,6 +172,9 @@ jobs:
|
||||
- <<: *swiftpm
|
||||
osx_image: xcode10.2
|
||||
name: 'macOS / swift-tools-version: 5.0 / Swift 5.0.0'
|
||||
- <<: *swiftpm
|
||||
osx_image: xcode11
|
||||
name: 'macOS / swift-tools-version: 5.0 / Swift 5.1.0'
|
||||
|
||||
- name: '`pod trunk push`'
|
||||
stage: deploy
|
||||
|
||||
Loading…
Reference in New Issue
Block a user