From 985a3f4274547cfadb35e681f884bd785167cef9 Mon Sep 17 00:00:00 2001 From: Patrick Balestra Date: Mon, 19 Jun 2017 16:46:18 +0200 Subject: [PATCH 1/4] Add support for Swift 4 and Xcode 9 --- Example/Pods/Pods.xcodeproj/project.pbxproj | 52 ++++++++++++++----- .../xcschemes/SquishButton.xcscheme | 2 +- .../SquishButton.xcodeproj/project.pbxproj | 30 ++++++++--- .../xcschemes/SquishButton-Example.xcscheme | 2 +- .../SquishButton/Base.lproj/LaunchScreen.xib | 6 +-- 5 files changed, 68 insertions(+), 24 deletions(-) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 796759c..e61a83d 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -30,27 +30,27 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 07C8373527EF48E45D8552296F7248E2 /* SquishButton.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SquishButton.framework; path = SquishButton.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 07C8373527EF48E45D8552296F7248E2 /* SquishButton.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SquishButton.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1179DC4EB04140016A0A7C7CFC1697EC /* SquishButton-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SquishButton-prefix.pch"; sourceTree = ""; }; 12C4CC94DF455C4C21C15F61AC5A2B0B /* Pods-SquishButton_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SquishButton_Tests.debug.xcconfig"; sourceTree = ""; }; 1F763C15C95DAF93CBD914F127C45657 /* Pods-SquishButton_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SquishButton_Example-resources.sh"; sourceTree = ""; }; 2CAC9D344B99187900CB7DF897B58110 /* SquishButton.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SquishButton.xcconfig; sourceTree = ""; }; 37BD465B86AA8C20815C36075F2756C2 /* Pods-SquishButton_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SquishButton_Example-umbrella.h"; sourceTree = ""; }; - 3D5B13503C454ECC32E8D9E2C5821C53 /* Pods_SquishButton_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SquishButton_Tests.framework; path = "Pods-SquishButton_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 3D5B13503C454ECC32E8D9E2C5821C53 /* Pods_SquishButton_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SquishButton_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4E1D1A843CC6D7AFBD1FF637CDC36564 /* Pods-SquishButton_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SquishButton_Tests-acknowledgements.markdown"; sourceTree = ""; }; - 4FC43AE1B3E3CF077DBD4E6C7D8ACD32 /* SquishButton.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = SquishButton.modulemap; sourceTree = ""; }; + 4FC43AE1B3E3CF077DBD4E6C7D8ACD32 /* SquishButton.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = SquishButton.modulemap; sourceTree = ""; }; 5F77105126D2E88F2374ED5B7B1B9A1A /* Pods-SquishButton_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SquishButton_Example-acknowledgements.markdown"; sourceTree = ""; }; - 62083999CCE4C345DFE5BB80D012F374 /* Pods_SquishButton_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SquishButton_Example.framework; path = "Pods-SquishButton_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 62083999CCE4C345DFE5BB80D012F374 /* Pods_SquishButton_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SquishButton_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 788EEC2E91493D5F5A793EEE5F91AF65 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 833ECBDDBC1249F79529B01C3C9DF6A7 /* Pods-SquishButton_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-SquishButton_Example.modulemap"; sourceTree = ""; }; + 833ECBDDBC1249F79529B01C3C9DF6A7 /* Pods-SquishButton_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-SquishButton_Example.modulemap"; sourceTree = ""; }; 8359CDA2DD8FE2C3AD80CF5A3842AA0C /* Pods-SquishButton_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SquishButton_Tests-frameworks.sh"; sourceTree = ""; }; 88293195FEF800DE1C0ADC8999358F2F /* Pods-SquishButton_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SquishButton_Example-dummy.m"; sourceTree = ""; }; 89CD61EE279A8EC5B509F204C661D532 /* Pods-SquishButton_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SquishButton_Example-acknowledgements.plist"; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9A19BFF8F67BB9B41DB9EF9D57599FCF /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9EB6939AC9370C3FA6115AA7CD8DBF66 /* SquishButton-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SquishButton-umbrella.h"; sourceTree = ""; }; 9EF3D3E6E4CBEF2E38F970C0DF823BAE /* Pods-SquishButton_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SquishButton_Tests-acknowledgements.plist"; sourceTree = ""; }; - A13E68379F5294495CBD15535241040F /* Pods-SquishButton_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-SquishButton_Tests.modulemap"; sourceTree = ""; }; + A13E68379F5294495CBD15535241040F /* Pods-SquishButton_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-SquishButton_Tests.modulemap"; sourceTree = ""; }; A3E7E7FAFDA2CF3EE5DDA2F6FECF8D66 /* Pods-SquishButton_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SquishButton_Tests-umbrella.h"; sourceTree = ""; }; C2E01B1A2C36623E55243F4E466C17FB /* Pods-SquishButton_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SquishButton_Tests-dummy.m"; sourceTree = ""; }; C41835F6C9E312C8E4615CC1413BEBA7 /* SquishButton-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SquishButton-dummy.m"; sourceTree = ""; }; @@ -125,7 +125,6 @@ children = ( CD297EFDB4C2F62BBEA4C9FFDA323EAD /* SquishButton.swift */, ); - name = Classes; path = Classes; sourceTree = ""; }; @@ -185,7 +184,6 @@ children = ( 1FD7F309FC4203AA1BFFB296F48C1807 /* Classes */, ); - name = SquishButton; path = SquishButton; sourceTree = ""; }; @@ -313,7 +311,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0900; + TargetAttributes = { + B45DAB7C5BF08814BA4B08D2D95BE6BF = { + LastSwiftMigration = 0900; + }; + }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -398,7 +401,8 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -555,19 +559,29 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_RELEASE=1", "$(inherited)", @@ -581,6 +595,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; SYMROOT = "${SRCROOT}/../build"; VALIDATE_PRODUCT = YES; }; @@ -611,7 +627,8 @@ PRODUCT_NAME = SquishButton; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -627,20 +644,30 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_DEBUG=1", @@ -658,6 +685,7 @@ ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SquishButton.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SquishButton.xcscheme index 9e6753a..e70c240 100644 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SquishButton.xcscheme +++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SquishButton.xcscheme @@ -1,6 +1,6 @@ - + - + @@ -16,7 +16,7 @@ -