From 02a9d846a8e73b583b6d353347816313b6997bcf Mon Sep 17 00:00:00 2001 From: S4cha Date: Wed, 1 Aug 2018 16:39:58 +0200 Subject: [PATCH] Updates to swift 4.2 --- Arrow.xcodeproj/project.pbxproj | 16 ++++++++-------- .../xcshareddata/xcschemes/Arrow.xcscheme | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Arrow.xcodeproj/project.pbxproj b/Arrow.xcodeproj/project.pbxproj index 9571183..95735e8 100644 --- a/Arrow.xcodeproj/project.pbxproj +++ b/Arrow.xcodeproj/project.pbxproj @@ -268,7 +268,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Sacha Durand Saint Omer"; TargetAttributes = { 99C292E61B24AD5E0008C32B = { @@ -322,7 +322,7 @@ /* Begin PBXShellScriptBuildPhase section */ 99709F361D310F74002A92D5 /* Run swiftlint */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 8; files = ( ); inputPaths = ( @@ -330,9 +330,9 @@ name = "Run swiftlint"; outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi"; + shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -448,7 +448,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -496,7 +496,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VALIDATE_PRODUCT = YES; }; name = Release; @@ -546,7 +546,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.fresh.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -582,7 +582,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.fresh.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; diff --git a/Arrow.xcodeproj/xcshareddata/xcschemes/Arrow.xcscheme b/Arrow.xcodeproj/xcshareddata/xcschemes/Arrow.xcscheme index 5d95173..b5bc6f3 100644 --- a/Arrow.xcodeproj/xcshareddata/xcschemes/Arrow.xcscheme +++ b/Arrow.xcodeproj/xcshareddata/xcschemes/Arrow.xcscheme @@ -1,6 +1,6 @@