swift 4.2.0

Xiaoye220 · Dec 7, 2018 · 7c679e5 · 7c679e5
1 parent 98fabad
commit 7c679e5
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 14 deletions.
diff --git a/IconFont.xcodeproj/project.pbxproj b/IconFont.xcodeproj/project.pbxproj
@@ -212,6 +212,7 @@
 				TargetAttributes = {
 					2FDC1D681FE3C0C300BD86B8 = {
 						CreatedOnToolsVersion = 9.1;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -409,7 +410,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.yzf.IconFont;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -425,7 +426,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.yzf.IconFont;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/IconFont.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/IconFont.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/...proj/project.xcworkspace/xcuserdata/yezengfeng.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/yezengfeng.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/IconFont.xcodeproj/xcuserdata/yezengfeng.xcuserdatad/xcschemes/xcschememanagement.plist b/IconFont.xcodeproj/xcuserdata/yezengfeng.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?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>SchemeUserState</key>
+	<dict>
+		<key>IconFont.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/IconFont/Code/Extensions/UIImage+Extensions.swift b/IconFont/Code/Extensions/UIImage+Extensions.swift
@@ -12,10 +12,10 @@ import UIKit
 extension UIImage {
 
     public static func iconFont(fontSize: CGFloat, icon: IconFontType, color: UIColor? = nil) -> UIImage {
-        var attributes = [NSAttributedStringKey: Any]()
-        attributes[NSAttributedStringKey.font] = UIFont(iconFont: icon, size: fontSize)
+        var attributes = [NSAttributedString.Key: Any]()
+        attributes[NSAttributedString.Key.font] = UIFont(iconFont: icon, size: fontSize)
         if let color = color {
-            attributes[NSAttributedStringKey.foregroundColor] = color
+            attributes[NSAttributedString.Key.foregroundColor] = color
         }
         let attributedString = NSAttributedString(string: icon.unicode, attributes: attributes)
 
@@ -33,10 +33,10 @@ extension UIImage {
     }
 
     public static func iconFont(imageSize: CGSize, icon: IconFontType, color: UIColor? = nil) -> UIImage {
-        var attributes = [NSAttributedStringKey: Any]()
-        attributes[NSAttributedStringKey.font] = UIFont(iconFont: icon, size: 1)
+        var attributes = [NSAttributedString.Key: Any]()
+        attributes[NSAttributedString.Key.font] = UIFont(iconFont: icon, size: 1)
         if let color = color {
-            attributes[NSAttributedStringKey.foregroundColor] = color
+            attributes[NSAttributedString.Key.foregroundColor] = color
         }
         var attributedString = NSAttributedString(string: icon.unicode, attributes: attributes)
 
@@ -61,7 +61,7 @@ extension UIImage {
         anchorRect.size.width = scaledWidth
         anchorRect.size.height = scaledHeight
 
-        attributes[NSAttributedStringKey.font] = UIFont(iconFont: icon, size: scale)
+        attributes[NSAttributedString.Key.font] = UIFont(iconFont: icon, size: scale)
         attributedString = NSAttributedString(string: icon.unicode, attributes: attributes)
 
         UIGraphicsBeginImageContextWithOptions(imageSize, false, UIScreen.main.scale)

diff --git a/IconFont/Code/Protocols/IconFontProtocols.swift b/IconFont/Code/Protocols/IconFontProtocols.swift
@@ -56,11 +56,11 @@ protocol IconFontExtensionsType {
 }
 
 extension IconFontExtensionsType {
-    func attributes(size fontSize: CGFloat, icon: IconFontType, color: UIColor?) -> [NSAttributedStringKey: Any] {
-        var attributes = [NSAttributedStringKey: Any]()
-        attributes[NSAttributedStringKey.font] = UIFont(iconFont: icon, size: fontSize)
+    func attributes(size fontSize: CGFloat, icon: IconFontType, color: UIColor?) -> [NSAttributedString.Key: Any] {
+        var attributes = [NSAttributedString.Key: Any]()
+        attributes[NSAttributedString.Key.font] = UIFont(iconFont: icon, size: fontSize)
         if let color = color {
-            attributes[NSAttributedStringKey.foregroundColor] = color
+            attributes[NSAttributedString.Key.foregroundColor] = color
         }
 
         return attributes

diff --git a/IconFont/Example/Other/AppDelegate.swift b/IconFont/Example/Other/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
     }