From 2d409cb81e569e025ac654fa3ef875a2f8b29369 Mon Sep 17 00:00:00 2001 From: Adam Modzelewski Date: Thu, 29 Jun 2017 20:21:34 +0200 Subject: [PATCH] Convert to swift 4 --- Pods/Pods.xcodeproj/project.pbxproj | 25 +++++++++++++- Sources/ease/Elastic.swift | 8 ++--- Sources/ease/Sin.swift | 8 ++--- TRX.xcodeproj/project.pbxproj | 34 ++++++++++++++----- .../xcshareddata/xcschemes/TRXTests.xcscheme | 4 ++- .../xcshareddata/xcschemes/TRXiOS.xcscheme | 4 ++- .../xcshareddata/xcschemes/TRXtvOS.xcscheme | 4 ++- 7 files changed, 66 insertions(+), 21 deletions(-) diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 7cf7b58..be512d3 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -839,7 +839,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0900; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -1075,20 +1075,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", @@ -1186,19 +1196,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)", @@ -1212,6 +1232,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.3; PROVISIONING_PROFILE_SPECIFIER = ABCDEFGHIJ/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; SYMROOT = "${SRCROOT}/../build"; VALIDATE_PRODUCT = YES; @@ -1352,6 +1373,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D6B2AC57C057697F5EDFFA1490607B67 /* Pods-TRXTests.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; @@ -1420,6 +1442,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = A015171E3978E83BFC328D94FC5CFA0E /* Pods-TRXTests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; diff --git a/Sources/ease/Elastic.swift b/Sources/ease/Elastic.swift index 40df062..ea970c8 100644 --- a/Sources/ease/Elastic.swift +++ b/Sources/ease/Elastic.swift @@ -15,7 +15,7 @@ public extension Ease { if t == 1 { return b + c } let p = d * 0.3 let s = p / 4; - return -(c * pow(2, 10 * (t - 1)) * sin((t * d - s) * (2 * M_PI) / p)) + b + return -(c * pow(2, 10 * (t - 1)) * sin((t * d - s) * (2 * .pi) / p)) + b } /// Ease out @@ -26,7 +26,7 @@ public extension Ease { if t == 1 { return b + c } let p = d * 0.3 let s = p / 4; - return c * pow(2, -10 * t) * sin((t * d - s) * (2 * M_PI) / p) + c + b + return c * pow(2, -10 * t) * sin((t * d - s) * (2 * .pi) / p) + c + b } /// Ease in out @@ -38,9 +38,9 @@ public extension Ease { let p = d * 0.45 let s = p / 4 if t < 1 { - return -0.5 * (c * pow(2, 10 * (t - 1)) * sin(((t - 1) * d - s) * (M_PI * 2) / p)) + b + return -0.5 * (c * pow(2, 10 * (t - 1)) * sin(((t - 1) * d - s) * (.pi * 2) / p)) + b } - return c * pow(2, -10 * (t - 1)) * sin(((t - 1) * d - s) * (M_PI * 2) / p) * 0.5 + c + b + return c * pow(2, -10 * (t - 1)) * sin(((t - 1) * d - s) * (.pi * 2) / p) * 0.5 + c + b } } diff --git a/Sources/ease/Sin.swift b/Sources/ease/Sin.swift index d486622..99a2943 100644 --- a/Sources/ease/Sin.swift +++ b/Sources/ease/Sin.swift @@ -12,21 +12,21 @@ public extension Ease { /// Ease in public static let easeIn: TimingFunction = { t, b, c, d in - return -c * cos(t / d * M_PI_2) + c + b + return -c * cos(t / d * .pi / 2) + c + b } /// Ease out public static let easeOut: TimingFunction = { t, b, c, d in - return c * sin(t / d * M_PI_2) + b + return c * sin(t / d * .pi / 2) + b } /// Ease in out public static let easeInOut: TimingFunction = { t, b, c, d in - return -c / 2 * (cos(M_PI * t / d) - 1) + b + return -c / 2 * (cos(.pi * t / d) - 1) + b } } -} \ No newline at end of file +} diff --git a/TRX.xcodeproj/project.pbxproj b/TRX.xcodeproj/project.pbxproj index 066d200..52b82fe 100644 --- a/TRX.xcodeproj/project.pbxproj +++ b/TRX.xcodeproj/project.pbxproj @@ -527,15 +527,15 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0900; TargetAttributes = { 663E81401D45FC6F00130EB5 = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 667AEFA11D460530004E291C = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 667AEFD21D460A7D004E291C = { CreatedOnToolsVersion = 7.3.1; @@ -798,7 +798,8 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -851,7 +852,8 @@ PRODUCT_NAME = TRX; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -912,7 +914,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; VERSIONING_SYSTEM = "apple-generic"; @@ -965,7 +968,8 @@ PRODUCT_NAME = TRX; 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; VALIDATE_PRODUCT = YES; @@ -978,7 +982,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 4FDB8A670D5D07A4F7D81EBC /* Pods-TRXTests.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -1031,7 +1035,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 35D73B81CBB1F61CC6AB06ED /* Pods-TRXTests.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -1076,12 +1080,18 @@ 66D55E921D45FA7400A4DA1C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = 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_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; @@ -1101,12 +1111,18 @@ 66D55E931D45FA7400A4DA1C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = 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_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; diff --git a/TRX.xcodeproj/xcshareddata/xcschemes/TRXTests.xcscheme b/TRX.xcodeproj/xcshareddata/xcschemes/TRXTests.xcscheme index f739f9f..bc8b7d6 100644 --- a/TRX.xcodeproj/xcshareddata/xcschemes/TRXTests.xcscheme +++ b/TRX.xcodeproj/xcshareddata/xcschemes/TRXTests.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/TRX.xcodeproj/xcshareddata/xcschemes/TRXtvOS.xcscheme b/TRX.xcodeproj/xcshareddata/xcschemes/TRXtvOS.xcscheme index 674fee8..100a1cd 100644 --- a/TRX.xcodeproj/xcshareddata/xcschemes/TRXtvOS.xcscheme +++ b/TRX.xcodeproj/xcshareddata/xcschemes/TRXtvOS.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"