From 06971b47191efd9a96c99691d0af7f0faec4e481 Mon Sep 17 00:00:00 2001 From: Yoichi Tagaya Date: Sun, 15 Jan 2017 17:17:38 +0900 Subject: [PATCH 1/4] Use Swift 3.0.2 on Travis CI. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cbd2a56..3b45a2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # reference: http://www.objc.io/issue-6/travis-ci.html language: objective-c -osx_image: xcode8 +osx_image: xcode8.2 env: global: - LC_CTYPE=en_US.UTF-8 From 811927a37f86d8bab94cdc08b3351f97d78993ce Mon Sep 17 00:00:00 2001 From: Yoichi Tagaya Date: Sun, 15 Jan 2017 17:26:35 +0900 Subject: [PATCH 2/4] Remove redundant SDK version settings from .travis.yml. --- .travis.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b45a2b..82ae45e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,18 +7,15 @@ env: - LC_CTYPE=en_US.UTF-8 - LANG=en_US.UTF-8 - PROJECT=SwinjectStoryboard.xcodeproj - - IOS_SDK=iphonesimulator10.0 - - OSX_SDK=macosx10.12 - - TVOS_SDK=appletvsimulator10.0 matrix: ## The iOS 8.1 simulator is commented out because it does not start. It looks a problem of the simulator. ## Uncomment the following line after the simulator problem is fixed. # - DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="Swinject-iOS" SDK="$IOS_SDK" PLATFORM="iOS" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=9.3,name=iPhone 6" SCHEME="Swinject-iOS" SDK="$IOS_SDK" PLATFORM="iOS" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=10.0,name=iPhone 6S Plus" SCHEME="Swinject-iOS" SDK="$IOS_SDK" PLATFORM="iOS" POD_LINT="YES" ACTION="test" - - DESTINATION="arch=x86_64" SCHEME="Swinject-OSX" SDK="$OSX_SDK" PLATFORM="Mac" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="$TVOS_SDK" PLATFORM="tvOS" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="$TVOS_SDK" PLATFORM="tvOS" POD_LINT="NO" ACTION="test" + - DESTINATION="OS=9.3,name=iPhone 6" SCHEME="Swinject-iOS" SDK="iphonesimulator" PLATFORM="iOS" POD_LINT="NO" ACTION="test" + - DESTINATION="OS=10.0,name=iPhone 6S Plus" SCHEME="Swinject-iOS" SDK="iphonesimulator" PLATFORM="iOS" POD_LINT="YES" ACTION="test" + - DESTINATION="arch=x86_64" SCHEME="Swinject-OSX" SDK="$OSX_SDK" PLATFORM="macosx" POD_LINT="NO" ACTION="test" + - DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" PLATFORM="tvOS" POD_LINT="NO" ACTION="test" + - DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" PLATFORM="tvOS" POD_LINT="NO" ACTION="test" before_install: - git submodule update --recursive script: From 562353c885f5565504f422d5903fce3ee2553ded Mon Sep 17 00:00:00 2001 From: Yoichi Tagaya Date: Sun, 15 Jan 2017 17:27:55 +0900 Subject: [PATCH 3/4] Update iOS version in .travis.yml. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82ae45e..e7768b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: ## Uncomment the following line after the simulator problem is fixed. # - DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="Swinject-iOS" SDK="$IOS_SDK" PLATFORM="iOS" POD_LINT="NO" ACTION="test" - DESTINATION="OS=9.3,name=iPhone 6" SCHEME="Swinject-iOS" SDK="iphonesimulator" PLATFORM="iOS" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=10.0,name=iPhone 6S Plus" SCHEME="Swinject-iOS" SDK="iphonesimulator" PLATFORM="iOS" POD_LINT="YES" ACTION="test" + - DESTINATION="OS=10.1,name=iPhone 6S Plus" SCHEME="Swinject-iOS" SDK="iphonesimulator" PLATFORM="iOS" POD_LINT="YES" ACTION="test" - DESTINATION="arch=x86_64" SCHEME="Swinject-OSX" SDK="$OSX_SDK" PLATFORM="macosx" POD_LINT="NO" ACTION="test" - DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" PLATFORM="tvOS" POD_LINT="NO" ACTION="test" - DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" PLATFORM="tvOS" POD_LINT="NO" ACTION="test" From 5c5582dddfe4fef137fd3ff9223c0eee933d7073 Mon Sep 17 00:00:00 2001 From: Yoichi Tagaya Date: Sun, 15 Jan 2017 19:05:35 +0900 Subject: [PATCH 4/4] Run `pod repo update` before `pod lib lint` to avoid an error in .travis.yml. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e7768b0..beecf2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,8 @@ script: - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ENABLE_TESTABILITY=YES ONLY_ACTIVE_ARCH=NO $ACTION | xcpretty - if [ $POD_LINT == "YES" ]; then - pod lib lint --quick; + pod repo update; + pod lib lint; fi notifications: email: