From 44e73409e2cbbfb905fc4da0897a2f98bab77f3c Mon Sep 17 00:00:00 2001 From: Dwayne Coussement Date: Wed, 5 Sep 2018 15:40:41 +0200 Subject: [PATCH] Swift 4.2 compatibility --- SwiftMonkey.podspec | 1 + SwiftMonkey/SwiftMonkey.xcodeproj/project.pbxproj | 9 +++++++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/xcschemes/SwiftMonkey.xcscheme | 4 +--- .../SwiftMonkeyExample.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ SwiftMonkeyPaws.podspec | 1 + SwiftMonkeyPaws/MonkeyPaws.swift | 4 ++-- .../SwiftMonkeyPaws.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/xcschemes/SwiftMonkeyPaws.xcscheme | 4 +--- 11 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 SwiftMonkey/SwiftMonkey.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 SwiftMonkeyExample/SwiftMonkeyExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/SwiftMonkey.podspec b/SwiftMonkey.podspec index d403475..0026877 100644 --- a/SwiftMonkey.podspec +++ b/SwiftMonkey.podspec @@ -17,5 +17,6 @@ Pod::Spec.new do |s| s.source_files = "SwiftMonkey/*.swift" s.exclude_files = "SwiftMonkey/Package.swift" s.framework = "XCTest" + s.swift_version = "4.2" s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' } end diff --git a/SwiftMonkey/SwiftMonkey.xcodeproj/project.pbxproj b/SwiftMonkey/SwiftMonkey.xcodeproj/project.pbxproj index e7aba59..933d17e 100644 --- a/SwiftMonkey/SwiftMonkey.xcodeproj/project.pbxproj +++ b/SwiftMonkey/SwiftMonkey.xcodeproj/project.pbxproj @@ -125,6 +125,11 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 9999; + TargetAttributes = { + OBJ_17 = { + LastSwiftMigration = 1000; + }; + }; }; buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "SwiftMonkey" */; compatibilityVersion = "Xcode 3.2"; @@ -176,7 +181,7 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGET_NAME = SwiftMonkey; }; name = Debug; @@ -198,7 +203,7 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGET_NAME = SwiftMonkey; }; name = Release; diff --git a/SwiftMonkey/SwiftMonkey.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftMonkey/SwiftMonkey.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SwiftMonkey/SwiftMonkey.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SwiftMonkey/SwiftMonkey.xcodeproj/xcshareddata/xcschemes/SwiftMonkey.xcscheme b/SwiftMonkey/SwiftMonkey.xcodeproj/xcshareddata/xcschemes/SwiftMonkey.xcscheme index 31ba13d..78d8ad8 100644 --- a/SwiftMonkey/SwiftMonkey.xcodeproj/xcshareddata/xcschemes/SwiftMonkey.xcscheme +++ b/SwiftMonkey/SwiftMonkey.xcodeproj/xcshareddata/xcschemes/SwiftMonkey.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/SwiftMonkeyExample/SwiftMonkeyExample.xcodeproj/project.pbxproj b/SwiftMonkeyExample/SwiftMonkeyExample.xcodeproj/project.pbxproj index 966745d..b07ca4b 100644 --- a/SwiftMonkeyExample/SwiftMonkeyExample.xcodeproj/project.pbxproj +++ b/SwiftMonkeyExample/SwiftMonkeyExample.xcodeproj/project.pbxproj @@ -236,7 +236,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0810; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Zalando SE"; TargetAttributes = { C929B5301DD0A764004B256F = { @@ -391,6 +391,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -398,6 +399,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -448,6 +450,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -455,6 +458,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/SwiftMonkeyExample/SwiftMonkeyExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftMonkeyExample/SwiftMonkeyExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SwiftMonkeyExample/SwiftMonkeyExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SwiftMonkeyPaws.podspec b/SwiftMonkeyPaws.podspec index 8631297..dbcb93b 100644 --- a/SwiftMonkeyPaws.podspec +++ b/SwiftMonkeyPaws.podspec @@ -15,5 +15,6 @@ Pod::Spec.new do |s| s.platform = :ios, '8.0' s.source = { :git => "https://github.com/zalando/SwiftMonkey.git", :tag => "#{s.version}" } s.source_files = "SwiftMonkeyPaws/*.swift" + s.swift_version = "4.2" s.exclude_files = "SwiftMonkeyPaws/Package.swift" end diff --git a/SwiftMonkeyPaws/MonkeyPaws.swift b/SwiftMonkeyPaws/MonkeyPaws.swift index 203a7d5..0e4f0b1 100644 --- a/SwiftMonkeyPaws/MonkeyPaws.swift +++ b/SwiftMonkeyPaws/MonkeyPaws.swift @@ -210,7 +210,7 @@ private class Gesture { numberLayer.string = "1" numberLayer.bounds = CGRect(x:0, y: 0, width: 32, height: 13) numberLayer.fontSize = 10 - numberLayer.alignmentMode = kCAAlignmentCenter + numberLayer.alignmentMode = CATextLayerAlignmentMode.center numberLayer.foregroundColor = colour.cgColor numberLayer.position = from numberLayer.contentsScale = UIScreen.main.scale @@ -254,7 +254,7 @@ private class Gesture { let maskLayer = CAShapeLayer() maskLayer.path = maskPath - maskLayer.fillRule = kCAFillRuleEvenOdd + maskLayer.fillRule = CAShapeLayerFillRule.evenOdd maskLayer.position = self.startLayer.position newLayer.mask = maskLayer diff --git a/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/project.pbxproj b/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/project.pbxproj index df432d2..7d34afc 100644 --- a/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/project.pbxproj +++ b/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/project.pbxproj @@ -173,7 +173,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGET_NAME = SwiftMonkeyPaws; }; name = Debug; @@ -195,7 +195,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGET_NAME = SwiftMonkeyPaws; }; name = Release; diff --git a/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/xcshareddata/xcschemes/SwiftMonkeyPaws.xcscheme b/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/xcshareddata/xcschemes/SwiftMonkeyPaws.xcscheme index ac9433c..7dbfc74 100644 --- a/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/xcshareddata/xcschemes/SwiftMonkeyPaws.xcscheme +++ b/SwiftMonkeyPaws/SwiftMonkeyPaws.xcodeproj/xcshareddata/xcschemes/SwiftMonkeyPaws.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO"