From 69765e7d92e3c88315f1cf80f25b4ceccaaf0999 Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Wed, 15 Jun 2016 22:39:10 +0900 Subject: [PATCH 1/3] Xcode 8 and Swift 2.3 compatibility --- Himotoki.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Himotoki.xcodeproj/project.pbxproj b/Himotoki.xcodeproj/project.pbxproj index 5c4b3df..4db14e1 100644 --- a/Himotoki.xcodeproj/project.pbxproj +++ b/Himotoki.xcodeproj/project.pbxproj @@ -576,9 +576,11 @@ }; CDF03E321AF606F60041C3AA = { CreatedOnToolsVersion = 6.3; + LastSwiftMigration = 0800; }; CDF03E3C1AF606F60041C3AA = { CreatedOnToolsVersion = 6.3; + LastSwiftMigration = 0800; }; }; }; @@ -826,6 +828,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.ikesyo.$(PRODUCT_NAME:rfc1034identifier)"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -845,6 +848,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.ikesyo.$(PRODUCT_NAME:rfc1034identifier)"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; From 63e3530685547e35c6cb46db285cc378eaf78e19 Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Wed, 15 Jun 2016 22:47:13 +0900 Subject: [PATCH 2/3] [CocoaPods] Use Swift 2.3 --- Himotoki.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/Himotoki.podspec b/Himotoki.podspec index 2eb79d4..f9ac98f 100644 --- a/Himotoki.podspec +++ b/Himotoki.podspec @@ -24,4 +24,5 @@ DESC s.source = { :git => "https://github.com/ikesyo/Himotoki.git", :tag => s.version } s.source_files = "Sources/**/*.swift" s.requires_arc = true + s.pod_target_xcconfig = { "SWIFT_VERSION" => "2.3" } end From c1c0842573d5bf158fdb72097fe34c0fa97fb91a Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Wed, 15 Jun 2016 22:51:31 +0900 Subject: [PATCH 3/3] [CI][Travis] Xcode 8 --- .travis.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8b6a93..f1c038b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,18 +2,24 @@ env: global: - LC_CTYPE=en_US.UTF-8 matrix: + allow_failures: + - osx_image: xcode8 + fast_finish: true include: - os: osx language: objective-c osx_image: xcode7.3 - os: osx - language: generic - osx_image: xcode7.3 - before_install: - - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)" - script: - - swift build - - swift test + language: objective-c + osx_image: xcode8 +# - os: osx +# language: generic +# osx_image: xcode7.3 +# before_install: +# - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)" +# script: +# - swift build +# - swift test - os: linux language: generic sudo: required @@ -28,11 +34,11 @@ git: before_install: - git submodule update --init --recursive script: - - pod lib lint --allow-warnings + - pod lib lint --allow-warnings --quick - set -o pipefail - xcodebuild test -scheme Himotoki-Mac -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c - - xcodebuild test -scheme Himotoki-iOS -configuration Release ENABLE_TESTABILITY=YES -sdk iphonesimulator | xcpretty -c - - xcodebuild test -scheme Himotoki-tvOS -configuration Release ENABLE_TESTABILITY=YES -sdk appletvsimulator | xcpretty -c - - xcodebuild build -scheme Himotoki-watchOS -configuration Release -sdk watchsimulator | xcpretty -c + - xcodebuild test -scheme Himotoki-iOS -configuration Release ENABLE_TESTABILITY=YES -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6s" | xcpretty -c + - xcodebuild test -scheme Himotoki-tvOS -configuration Release ENABLE_TESTABILITY=YES -sdk appletvsimulator -destination "platform=tvOS Simulator,name=Apple TV 1080p" | xcpretty -c + - xcodebuild build -scheme Himotoki-watchOS -configuration Release -sdk watchsimulator -destination "platform=watchOS Simulator,name=Apple Watch - 38mm" | xcpretty -c notifications: email: false