Merge pull request #126 from ikesyo/swift2.3

Xcode 8 and Swift 2.3 compatibility
ikesyo · Jun 17, 2016 · 06271ab · 06271ab
2 parents 91fc16a + c1c0842
commit 06271ab
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git 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
diff --git 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
diff --git 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";