Skip to content

Commit cc9d0ee

Browse files
committed
Update Travis Configuration
1 parent 149c486 commit cc9d0ee

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
osx_image: xcode9.3
1+
osx_image: xcode10
22
language: objective-c
33
sudo: required
44
env:
55
global:
66
- PROJECT="RxKeyboard.xcodeproj"
77
- SCHEME="RxKeyboard-Package"
8-
- IOS_SDK="iphonesimulator11.3"
9-
- MACOS_SDK="macosx10.13"
10-
- TVOS_SDK="appletvsimulator11.3"
11-
- WATCHOS_SDK="watchsimulator4.0"
8+
- IOS_SDK="iphonesimulator"
9+
- MACOS_SDK="macosx10.14"
10+
- TVOS_SDK="appletvsimulator12.0"
11+
- WATCHOS_SDK="watchsimulator5.0"
1212
- FRAMEWORK="RxKeyboard"
1313
matrix:
14-
- SDK="$IOS_SDK" TEST=0 DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.3"
14+
- SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.0 DESTINATION="platform=iOS Simulator,name=iPhone 8"
15+
- SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.2 DESTINATION="platform=iOS Simulator,name=iPhone 8"
1516

1617
install:
1718
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
@@ -24,7 +25,7 @@ before_script:
2425

2526
script:
2627
- if [ $TEST == 1 ]; then
27-
xcodebuild clean build test
28+
xcodebuild clean SWIFT_VERSION=${SWIFT_VERSION} build test
2829
-project "$PROJECT"
2930
-scheme "$SCHEME"
3031
-sdk "$SDK"
@@ -33,7 +34,7 @@ script:
3334
-enableCodeCoverage YES
3435
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c;
3536
else
36-
xcodebuild clean build
37+
xcodebuild clean SWIFT_VERSION=${SWIFT_VERSION} build
3738
-project "$PROJECT"
3839
-scheme "$SCHEME"
3940
-sdk "$SDK"
@@ -42,7 +43,7 @@ script:
4243
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c;
4344
fi
4445
- bundle exec pod repo update
45-
- bundle exec pod lib lint --verbose --allow-warnings --fail-fast
46+
- bundle exec pod lib lint --swift-version=${SWIFT_VERSION} --verbose --allow-warnings --fail-fast
4647

4748
before_deploy:
4849
- bundle exec swiftproj generate-xcconfig --podspec RxKeyboard.podspec

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.2
1+
// swift-tools-version:4.0
22

33
import PackageDescription
44

0 commit comments

Comments
 (0)