Update to Swift 4.2

samrayner · Nov 3, 2018 · 76705c2 · 76705c2
1 parent ff5bd99
commit 76705c2
Show file tree

Hide file tree

Showing 24 changed files with 499 additions and 362 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/ColorAssetCatalog.podspec b/ColorAssetCatalog.podspec
@@ -8,7 +8,8 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ColorAssetCatalog'
-  s.version          = '1.0'
+  s.version          = '1.1'
+  s.swift_version    = '4.2'
   s.summary          = 'Adds iOS 9+ compatibility for named colors in asset catalogs.'
 
 # This description is used to generate tags and improve search results.

diff --git a/ColorAssetCatalog/Classes/ColorAssetManager.swift b/ColorAssetCatalog/Classes/ColorAssetManager.swift
@@ -23,7 +23,7 @@ public class ColorAssetManager {
     var cgColors: [String: CGColor] = [:]
 
     private init() {
-        NotificationCenter.default.addObserver(self, selector: #selector(clearCache), name: .UIApplicationDidReceiveMemoryWarning, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(clearCache), name: UIApplication.didReceiveMemoryWarningNotification, object: nil)
     }
 
     ///Clear all used color objects from memory.

diff --git a/Example/ColorAssetCatalog.xcodeproj/project.pbxproj b/Example/ColorAssetCatalog.xcodeproj/project.pbxproj
@@ -188,7 +188,6 @@
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
 				A85B214E861EF6BDF4C61327 /* [CP] Embed Pods Frameworks */,
-				B760A7BEB3607929CA1A8717 /* [CP] Copy Pods Resources */,
 				F40E9DF01EEE9C94004C9D05 /* SwiftLint */,
 				F4774E561EEEAD9A002782C5 /* CopyFiles */,
 			);
@@ -209,8 +208,6 @@
 				607FACE11AFB9204008FA782 /* Sources */,
 				607FACE21AFB9204008FA782 /* Frameworks */,
 				607FACE31AFB9204008FA782 /* Resources */,
-				1EC65D72B8205EE02354B3E8 /* [CP] Embed Pods Frameworks */,
-				1061CBFCB8DEC5828B601215 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -229,18 +226,18 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = C4Y4L9QV9Z;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1010;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = C4Y4L9QV9Z;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1010;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -286,36 +283,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1061CBFCB8DEC5828B601215 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ColorAssetCatalog_Tests/Pods-ColorAssetCatalog_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		1EC65D72B8205EE02354B3E8 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ColorAssetCatalog_Tests/Pods-ColorAssetCatalog_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		A85B214E861EF6BDF4C61327 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -334,21 +301,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ColorAssetCatalog_Example/Pods-ColorAssetCatalog_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B760A7BEB3607929CA1A8717 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ColorAssetCatalog_Example/Pods-ColorAssetCatalog_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		EA3E3DBABE09213E1216372F /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -461,12 +413,14 @@
 				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_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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -499,6 +453,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -514,12 +469,14 @@
 				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_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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -544,6 +501,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -560,8 +518,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -577,8 +534,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -596,8 +552,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -611,8 +566,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/...ple/ColorAssetCatalog.xcodeproj/xcshareddata/xcschemes/ColorAssetCatalog-Example.xcscheme b/...ple/ColorAssetCatalog.xcodeproj/xcshareddata/xcschemes/ColorAssetCatalog-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/ColorAssetCatalog.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/ColorAssetCatalog.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Example/ColorAssetCatalog/AppDelegate.swift b/Example/ColorAssetCatalog/AppDelegate.swift
@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Example/ColorAssetCatalog/Info.plist b/Example/ColorAssetCatalog/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Example/Podfile b/Example/Podfile
@@ -7,7 +7,5 @@ target 'ColorAssetCatalog_Example' do
 
   target 'ColorAssetCatalog_Tests' do
     inherit! :search_paths
-
-
   end
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - ColorAssetCatalog (1.0)
+  - ColorAssetCatalog (1.1)
 
 DEPENDENCIES:
   - ColorAssetCatalog (from `../`)
 
 EXTERNAL SOURCES:
   ColorAssetCatalog:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  ColorAssetCatalog: ba25a9547a7f3b72b7553f332e961a6cd913c01b
+  ColorAssetCatalog: 3ee9926c9f01c32c40b605b6b549c5a14d5cc357
 
-PODFILE CHECKSUM: 89fa1c485c40cfe868239bf0487f00e30a7e49da
+PODFILE CHECKSUM: 295851e3adf45e3182b8db34896db90b8e4162c0
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/Example/Pods/Local Podspecs/ColorAssetCatalog.podspec.json b/Example/Pods/Local Podspecs/ColorAssetCatalog.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,5 @@ target 'ColorAssetCatalog_Example' do @@
       target 'ColorAssetCatalog_Tests' do
         inherit! :search_paths
       end
     end