From 2c76d758350968d14a05083f28fc854958b7448c Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Tue, 3 Oct 2017 10:12:00 +0200 Subject: [PATCH 1/3] Disable code coverage --- .../xcshareddata/xcschemes/SweetRouter.xcscheme | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter.xcscheme b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter.xcscheme index dabf11b..d2e6582 100644 --- a/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter.xcscheme +++ b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter.xcscheme @@ -27,8 +27,7 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" language = "" - shouldUseLaunchSchemeArgsEnv = "YES" - codeCoverageEnabled = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> From 687310b478b6b05b718c7924461c114eee907720 Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Tue, 3 Oct 2017 10:12:14 +0200 Subject: [PATCH 2/3] Disable objc inference --- SweetRouter.xcodeproj/project.pbxproj | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/SweetRouter.xcodeproj/project.pbxproj b/SweetRouter.xcodeproj/project.pbxproj index f85ff95..6f35e78 100644 --- a/SweetRouter.xcodeproj/project.pbxproj +++ b/SweetRouter.xcodeproj/project.pbxproj @@ -805,7 +805,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; name = Debug; @@ -828,7 +828,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouter; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; name = Release; @@ -842,7 +842,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouterTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; name = Debug; @@ -856,7 +856,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouterTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; name = Release; @@ -879,7 +879,7 @@ PRODUCT_NAME = SweetRouter; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -904,7 +904,7 @@ PRODUCT_NAME = SweetRouter; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -922,7 +922,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.violentoctopus.SweetRouter-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; TVOS_DEPLOYMENT_TARGET = 10.2; }; @@ -939,7 +939,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.violentoctopus.SweetRouter-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; TVOS_DEPLOYMENT_TARGET = 10.2; }; @@ -963,7 +963,7 @@ PRODUCT_NAME = SweetRouter; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 3.2; @@ -988,7 +988,7 @@ PRODUCT_NAME = SweetRouter; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 3.2; @@ -1017,7 +1017,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; name = Debug; @@ -1044,7 +1044,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; name = Release; @@ -1063,7 +1063,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.violentoctopus.SweetRouter-MacTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; name = Debug; @@ -1082,7 +1082,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.violentoctopus.SweetRouter-MacTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; name = Release; From dd59feceafe78a4f4b6193ecf09176474302d7ff Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Tue, 3 Oct 2017 10:13:56 +0200 Subject: [PATCH 3/3] Remove preopening simulator --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a76ddca..aac3da0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,7 @@ osx_image: xcode9 matrix: include: - script: - - open -a "simulator" --args -CurrentDeviceUDID EEE357DD-82EF-43B5-AABC-27E3B59DB403 - - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter -destination 'platform=iOS Simulator,OS=10.3.1,id=EEE357DD-82EF-43B5-AABC-27E3B59DB403' + - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter -destination 'platform=iOS Simulator,OS=11.0,name=iPhone 8 Plus' - script: - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter-tvOS -destination 'platform=tvOS Simulator,OS=10.2,name=Apple TV 1080p'