Update for Swift3.0

morizotter · Sep 16, 2016 · 72ba7f1 · 72ba7f1
1 parent 6dc4590
commit 72ba7f1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/SwiftFontName.xcodeproj/project.pbxproj b/SwiftFontName.xcodeproj/project.pbxproj
@@ -110,6 +110,7 @@
 				TargetAttributes = {
 					908CE08F1B5AB6F10009CA5D = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -254,6 +255,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -272,6 +274,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

diff --git a/SwiftFontName/FontName.swift b/SwiftFontName/FontName.swift
@@ -565,7 +565,7 @@ extension FontName {
 }
 
 extension FontName {
-    private static func fontName(fontName name: String, osVersion version: Float? = nil) -> String {
+    fileprivate static func fontName(fontName name: String, osVersion version: Float? = nil) -> String {
         if let _ = version {}
         return name
     }

diff --git a/SwiftFontName/LocalizedFontName.swift b/SwiftFontName/LocalizedFontName.swift
@@ -8,8 +8,8 @@
 
 import UIKit
 
-public func LocalizedFontName(defaultFontName: String, localizedFontNames: [String: String]) -> String {
-    let preferredLanguage : String = NSLocale.preferredLanguages().first!
+public func LocalizedFontName(_ defaultFontName: String, localizedFontNames: [String: String]) -> String {
+    let preferredLanguage : String = Locale.preferredLanguages.first!
     for (k, _) in localizedFontNames {
         if preferredLanguage == k || preferredLanguage.hasPrefix(k + "-") {
             return localizedFontNames[k]!