From 08907943bb41c81ffd4a523e977eb52e0b08193a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Tue, 20 Dec 2016 00:07:19 +0100 Subject: [PATCH 1/2] Specify Swift version without patch (fix #16) --- .swift-version | 2 +- Example/Example.xcodeproj/project.pbxproj | 4 ++-- SFFocusViewLayout.xcodeproj/project.pbxproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.swift-version b/.swift-version index 13d683c..f398a20 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0.1 \ No newline at end of file +3.0 \ No newline at end of file diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 9cbaf40..6049696 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -362,7 +362,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0.1; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -402,7 +402,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0.1; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; diff --git a/SFFocusViewLayout.xcodeproj/project.pbxproj b/SFFocusViewLayout.xcodeproj/project.pbxproj index 0b34407..05931f4 100644 --- a/SFFocusViewLayout.xcodeproj/project.pbxproj +++ b/SFFocusViewLayout.xcodeproj/project.pbxproj @@ -295,7 +295,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0.1; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -336,7 +336,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0.1; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; From f105c79715820c8616311b4966bb74b115542ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihat=20Gu=CC=88ndu=CC=88z?= Date: Tue, 20 Dec 2016 00:12:51 +0100 Subject: [PATCH 2/2] Update Xcode to 8.2 on Travis CI --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48dc34e..669901b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: objective-c os: osx -osx_image: xcode8.1 +osx_image: xcode8.2 script: -- set -o pipefail +- set -o pipefail - xcodebuild clean test -workspace SFFocusViewLayout.xcworkspace -scheme SFFocusViewLayout -destination "platform=iOS Simulator,name=iPhone 7" -enableCodeCoverage YES | xcpretty - pod lib lint --quick