From 4502081d713257bb414d7dffa25f10ba59fa6770 Mon Sep 17 00:00:00 2001 From: JARinteractive Date: Thu, 14 Sep 2017 10:50:39 -0500 Subject: [PATCH] Swift 4 --- ReLax/ReLax.xcodeproj/project.pbxproj | 124 +++--------------- .../xcshareddata/xcschemes/ReLax.xcscheme | 4 +- .../ReLaxExample.xcodeproj/project.pbxproj | 29 +++- .../xcschemes/ReLaxExample.xcscheme | 4 +- .../xcschemes/ReLaxTopShelfExample.xcscheme | 4 +- 5 files changed, 50 insertions(+), 115 deletions(-) diff --git a/ReLax/ReLax.xcodeproj/project.pbxproj b/ReLax/ReLax.xcodeproj/project.pbxproj index ecb2918..2c1af0d 100644 --- a/ReLax/ReLax.xcodeproj/project.pbxproj +++ b/ReLax/ReLax.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 4D72CD761E690A9A005D8769 /* ReLax.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D72CD6C1E690A99005D8769 /* ReLax.framework */; }; 4D72CD7D1E690A9A005D8769 /* ReLax.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D72CD6F1E690A99005D8769 /* ReLax.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D72CDAA1E690C1B005D8769 /* DataHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CD981E690C1B005D8769 /* DataHelpers.swift */; }; 4D72CDAB1E690C1B005D8769 /* LCRLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CD991E690C1B005D8769 /* LCRLayer.swift */; }; @@ -30,21 +29,10 @@ 4DD381971E6B7A0B003DCB3E /* CARHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DD381961E6B7A0B003DCB3E /* CARHeader.swift */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 4D72CD771E690A9A005D8769 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4D72CD631E690A99005D8769 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4D72CD6B1E690A99005D8769; - remoteInfo = ReLax; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 4D72CD6C1E690A99005D8769 /* ReLax.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReLax.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4D72CD6F1E690A99005D8769 /* ReLax.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReLax.h; sourceTree = ""; }; 4D72CD701E690A99005D8769 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4D72CD751E690A9A005D8769 /* ReLaxTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReLaxTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 4D72CD981E690C1B005D8769 /* DataHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataHelpers.swift; sourceTree = ""; }; 4D72CD991E690C1B005D8769 /* LCRLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LCRLayer.swift; sourceTree = ""; }; 4D72CD9A1E690C1B005D8769 /* LCRLayeredImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LCRLayeredImage.swift; sourceTree = ""; }; @@ -74,14 +62,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4D72CD721E690A9A005D8769 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4D72CD761E690A9A005D8769 /* ReLax.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -98,7 +78,6 @@ isa = PBXGroup; children = ( 4D72CD6C1E690A99005D8769 /* ReLax.framework */, - 4D72CD751E690A9A005D8769 /* ReLaxTests.xctest */, ); name = Products; sourceTree = ""; @@ -187,24 +166,6 @@ productReference = 4D72CD6C1E690A99005D8769 /* ReLax.framework */; productType = "com.apple.product-type.framework"; }; - 4D72CD741E690A9A005D8769 /* ReLaxTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4D72CD831E690A9A005D8769 /* Build configuration list for PBXNativeTarget "ReLaxTests" */; - buildPhases = ( - 4D72CD711E690A9A005D8769 /* Sources */, - 4D72CD721E690A9A005D8769 /* Frameworks */, - 4D72CD731E690A9A005D8769 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4D72CD781E690A9A005D8769 /* PBXTargetDependency */, - ); - name = ReLaxTests; - productName = ReLaxTests; - productReference = 4D72CD751E690A9A005D8769 /* ReLaxTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -212,19 +173,14 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0820; - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = Asynchrony; TargetAttributes = { 4D72CD6B1E690A99005D8769 = { CreatedOnToolsVersion = 8.2; - LastSwiftMigration = 0820; + LastSwiftMigration = 0900; ProvisioningStyle = Manual; }; - 4D72CD741E690A9A005D8769 = { - CreatedOnToolsVersion = 8.2; - DevelopmentTeam = 9VPW79T9ZH; - ProvisioningStyle = Automatic; - }; }; }; buildConfigurationList = 4D72CD661E690A99005D8769 /* Build configuration list for PBXProject "ReLax" */; @@ -240,7 +196,6 @@ projectRoot = ""; targets = ( 4D72CD6B1E690A99005D8769 /* ReLax */, - 4D72CD741E690A9A005D8769 /* ReLaxTests */, ); }; /* End PBXProject section */ @@ -257,13 +212,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4D72CD731E690A9A005D8769 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -289,23 +237,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4D72CD711E690A9A005D8769 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 4D72CD781E690A9A005D8769 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4D72CD6B1E690A99005D8769 /* ReLax */; - targetProxy = 4D72CD771E690A9A005D8769 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 4D72CD7E1E690A9A005D8769 /* Debug */ = { isa = XCBuildConfiguration; @@ -316,7 +249,9 @@ 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_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -324,7 +259,11 @@ 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_ERROR; + 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; @@ -370,7 +309,9 @@ 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_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -378,7 +319,11 @@ 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_ERROR; + 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; @@ -427,7 +372,8 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -451,38 +397,13 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; - 4D72CD841E690A9A005D8769 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - DEVELOPMENT_TEAM = 9VPW79T9ZH; - INFOPLIST_FILE = ReLaxTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.asynchrony.ReLaxTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Debug; - }; - 4D72CD851E690A9A005D8769 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - DEVELOPMENT_TEAM = 9VPW79T9ZH; - INFOPLIST_FILE = ReLaxTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.asynchrony.ReLaxTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -504,15 +425,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4D72CD831E690A9A005D8769 /* Build configuration list for PBXNativeTarget "ReLaxTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4D72CD841E690A9A005D8769 /* Debug */, - 4D72CD851E690A9A005D8769 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 4D72CD631E690A99005D8769 /* Project object */; diff --git a/ReLax/ReLax.xcodeproj/xcshareddata/xcschemes/ReLax.xcscheme b/ReLax/ReLax.xcodeproj/xcshareddata/xcschemes/ReLax.xcscheme index da83370..3d8084d 100644 --- a/ReLax/ReLax.xcodeproj/xcshareddata/xcschemes/ReLax.xcscheme +++ b/ReLax/ReLax.xcodeproj/xcshareddata/xcschemes/ReLax.xcscheme @@ -1,6 +1,6 @@ @@ -45,6 +46,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ReLaxExample/ReLaxExample.xcodeproj/xcshareddata/xcschemes/ReLaxTopShelfExample.xcscheme b/ReLaxExample/ReLaxExample.xcodeproj/xcshareddata/xcschemes/ReLaxTopShelfExample.xcscheme index d18dc61..6d220a7 100644 --- a/ReLaxExample/ReLaxExample.xcodeproj/xcshareddata/xcschemes/ReLaxTopShelfExample.xcscheme +++ b/ReLaxExample/ReLaxExample.xcodeproj/xcshareddata/xcschemes/ReLaxTopShelfExample.xcscheme @@ -1,6 +1,6 @@ @@ -60,6 +61,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "" selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO"