Update Swift 5

kciter · Apr 6, 2019 · 834f319 · 834f319
1 parent 40751b2
commit 834f319
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/GlitchLabel.xcodeproj/project.pbxproj b/GlitchLabel.xcodeproj/project.pbxproj
@@ -7,11 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		9C83B74922596E3C00324A23 /* GlitchLabel.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 9C83B74822596E3C00324A23 /* GlitchLabel.podspec */; };
 		B64C3BE31CD0801700D91D98 /* GlitchLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = B64C3BE11CD0801700D91D98 /* GlitchLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B64C3BE41CD0801700D91D98 /* GlitchLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C3BE21CD0801700D91D98 /* GlitchLabel.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		9C83B74822596E3C00324A23 /* GlitchLabel.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GlitchLabel.podspec; sourceTree = "<group>"; };
 		B64C3BB61CD07C5B00D91D98 /* GlitchLabel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GlitchLabel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B64C3BE11CD0801700D91D98 /* GlitchLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GlitchLabel.h; path = Sources/GlitchLabel.h; sourceTree = SOURCE_ROOT; };
 		B64C3BE21CD0801700D91D98 /* GlitchLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GlitchLabel.swift; path = Sources/GlitchLabel.swift; sourceTree = SOURCE_ROOT; };
@@ -32,6 +34,7 @@
 		B64C3BAC1CD07C5B00D91D98 = {
 			isa = PBXGroup;
 			children = (
+				9C83B74822596E3C00324A23 /* GlitchLabel.podspec */,
 				B64C3BB81CD07C5B00D91D98 /* GlitchLabel */,
 				B64C3BB71CD07C5B00D91D98 /* Products */,
 			);
@@ -125,6 +128,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9C83B74922596E3C00324A23 /* GlitchLabel.podspec in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -272,7 +276,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -291,7 +295,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = kciter.GlitchLabel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/GlitchLabel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/GlitchLabel.xcodeproj/project.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/Sample/GlitchLabel.xcodeproj/project.pbxproj b/Sample/GlitchLabel.xcodeproj/project.pbxproj
@@ -107,7 +107,9 @@
 				TargetAttributes = {
 					B67E4C571CC9C51500B04CDA = {
 						CreatedOnToolsVersion = 7.3;
+						DevelopmentTeam = 5RTMJNH82H;
 						LastSwiftMigration = 0800;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
@@ -116,6 +118,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -268,12 +271,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 5RTMJNH82H;
 				INFOPLIST_FILE = GlitchLabel/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = kciter.GlitchLabel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "7325859d-4e0c-4f8b-98aa-73a3c93a95a2";
-				SWIFT_VERSION = 4.0;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -282,12 +288,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 5RTMJNH82H;
 				INFOPLIST_FILE = GlitchLabel/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = kciter.GlitchLabel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "7325859d-4e0c-4f8b-98aa-73a3c93a95a2";
-				SWIFT_VERSION = 4.0;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Sample/GlitchLabel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Sample/GlitchLabel.xcodeproj/project.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/Sample/GlitchLabel/AppDelegate.swift b/Sample/GlitchLabel/AppDelegate.swift
@@ -14,7 +14,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/Sources/GlitchLabel.swift b/Sources/GlitchLabel.swift
@@ -133,7 +133,7 @@ open class GlitchLabel: UILabel {
         UIGraphicsBeginImageContextWithOptions(rect.size, false, UIScreen.main.scale)
         text?.draw(in: rect, withAttributes: [
             NSAttributedString.Key.font: UIFont.init(name: font.fontName, size: font.pointSize)!,
-            NSAttributedStringKey.foregroundColor: UIColor.red
+            NSAttributedString.Key.foregroundColor: UIColor.red
             ])
 
         let redImage: UIImage = UIGraphicsGetImageFromCurrentImageContext()!
@@ -146,7 +146,7 @@ open class GlitchLabel: UILabel {
         UIGraphicsBeginImageContextWithOptions(rect.size, false, UIScreen.main.scale)
         text?.draw(in: rect, withAttributes: [
             NSAttributedString.Key.font: UIFont.init(name: font.fontName, size: font.pointSize)!,
-            NSAttributedStringKey.foregroundColor: UIColor.green
+            NSAttributedString.Key.foregroundColor: UIColor.green
             ])
         let greenImage: UIImage = UIGraphicsGetImageFromCurrentImageContext()!
         UIGraphicsEndImageContext()
@@ -158,7 +158,7 @@ open class GlitchLabel: UILabel {
         UIGraphicsBeginImageContextWithOptions(rect.size, false, UIScreen.main.scale)
         text?.draw(in: rect, withAttributes: [
             NSAttributedString.Key.font: UIFont.init(name: font.fontName, size: font.pointSize)!,
-            NSAttributedStringKey.foregroundColor: UIColor.blue
+            NSAttributedString.Key.foregroundColor: UIColor.blue
             ])
 
         let blueImage: UIImage = UIGraphicsGetImageFromCurrentImageContext()!
@@ -185,7 +185,7 @@ open class GlitchLabel: UILabel {
                            userInfo: nil,
                            repeats: true)
 
-        RunLoop.current.add(timer, forMode: RunLoop.Mode.defaultRunLoopMode)
+        RunLoop.current.add(timer, forMode: RunLoop.Mode.default)
     }
 
     fileprivate func random() -> Double {