migrate to Swift 4.2

younatics · younatics · commit 3ad82ef2ea2f · 2018-10-14T15:28:01.000+09:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/YNSearch.podspec b/YNSearch.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'YNSearch'
-  s.version          = '2.3.1'
+  s.version          = '2.3.2'
   s.summary          = 'Awesome fully customizable search view written in Swift 4'
 
   s.description      = <<-DESC
diff --git a/YNSearch.xcodeproj/project.pbxproj b/YNSearch.xcodeproj/project.pbxproj
@@ -227,18 +227,19 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = SeungyounYi;
 				TargetAttributes = {
 					19D22E2D1EA7A8F6006DF0AC = {
 						CreatedOnToolsVersion = 8.3.2;
 						DevelopmentTeam = 4G7K3CN2JU;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					19FE321A1EA7B77C00A4DB5E = {
 						CreatedOnToolsVersion = 8.3.2;
 						DevelopmentTeam = 4G7K3CN2JU;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -367,13 +368,15 @@
 				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;
 				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;
@@ -407,7 +410,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -428,13 +431,15 @@
 				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;
 				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;
@@ -460,7 +465,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -486,7 +491,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -507,7 +512,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.seungyounyi.YNSearch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -521,7 +526,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.seungyounyi.YNSearchDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -535,7 +540,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.seungyounyi.YNSearchDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/YNSearch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/YNSearch.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/YNSearch.xcodeproj/xcshareddata/xcschemes/YNSearch.xcscheme b/YNSearch.xcodeproj/xcshareddata/xcschemes/YNSearch.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -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/YNSearch/Objectification.swift b/YNSearch/Objectification.swift
@@ -53,7 +53,7 @@ public class Objectification {
     }
     
     private func properties(mirror: Mirror) -> [String] {
-        return mirror.children.flatMap { $0.label }
+        return mirror.children.compactMap { $0.label }
     }
     
     private func values(mirror: Mirror) -> [String] {
@@ -66,7 +66,7 @@ public class Objectification {
     }
     
     private func all(mirror: Mirror) -> [String] {
-        return mirror.children.flatMap { $0.label } + values(mirror: mirror)
+        return mirror.children.compactMap { $0.label } + values(mirror: mirror)
     }
     
     private func checkArray(object: Any) -> [String] {
diff --git a/YNSearch/YNSearch.swift b/YNSearch/YNSearch.swift
@@ -11,7 +11,7 @@ import UIKit
 open class YNSearch: NSObject {
     var pref: UserDefaults!
     
-    open static let shared: YNSearch = YNSearch()
+    public static let shared: YNSearch = YNSearch()
 
     public override init() {
         pref = UserDefaults.standard
diff --git a/YNSearch/YNSearchListView.swift b/YNSearch/YNSearchListView.swift
@@ -29,7 +29,7 @@ open class YNSearchListView: UITableView, UITableViewDelegate, UITableViewDataSo
         }
     }
 
-    public override init(frame: CGRect, style: UITableViewStyle) {
+    public override init(frame: CGRect, style: UITableView.Style) {
         super.init(frame: frame, style: style)
         self.initView()
     }
diff --git a/YNSearch/YNSearchListViewCell.swift b/YNSearch/YNSearchListViewCell.swift
@@ -9,14 +9,14 @@
 import UIKit
 
 open class YNSearchListViewCell: UITableViewCell {
-    open static let ID = "YNSearchListViewCell"
+    public static let ID = "YNSearchListViewCell"
     
     var leftMargin = 15
     
     open var searchImageView: UIImageView!
     open var searchLabel: UILabel!
         
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         
         self.initView()
diff --git a/YNSearch/YNSearchMainView.swift b/YNSearch/YNSearchMainView.swift
@@ -73,7 +73,7 @@ open class YNSearchMainView: UIView {
         self.addSubview(self.categoryLabel)
         
         let font = UIFont.systemFont(ofSize: 12)
-        let userAttributes = [NSAttributedStringKey.font : font, NSAttributedStringKey.foregroundColor: UIColor.gray]
+        let userAttributes = [NSAttributedString.Key.font : font, NSAttributedString.Key.foregroundColor: UIColor.gray]
         
         var formerWidth: CGFloat = margin
         var formerHeight: CGFloat = 50
diff --git a/YNSearch/YNSearchViewController.swift b/YNSearch/YNSearchViewController.swift
@@ -34,7 +34,7 @@ open class YNSearchViewController: UIViewController, UITextFieldDelegate {
         self.ynSearchTextfieldView.ynSearchTextField.addTarget(self, action: #selector(ynSearchTextfieldTextChanged(_:)), for: .editingChanged)
         self.ynSearchTextfieldView.cancelButton.addTarget(self, action: #selector(ynSearchTextfieldcancelButtonClicked), for: .touchUpInside)
         
-        self.ynSearchTextfieldView.ynSearchTextField.clearButtonMode = UITextFieldViewMode.whileEditing
+        self.ynSearchTextfieldView.ynSearchTextField.clearButtonMode = UITextField.ViewMode.whileEditing
         
         self.view.addSubview(self.ynSearchTextfieldView)
         
diff --git a/YNSearchDemo/AppDelegate.swift b/YNSearchDemo/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/YNSearchDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/YNSearchDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -138,6 +138,11 @@
       "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    },
     {
       "size" : "60x60",
       "idiom" : "car",

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public class Objectification {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private func properties(mirror: Mirror) -> [String] {`
`56`		`- return mirror.children.flatMap { $0.label }`
	`56`	`+ return mirror.children.compactMap { $0.label }`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private func values(mirror: Mirror) -> [String] {`
`@@ -66,7 +66,7 @@ public class Objectification {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`private func all(mirror: Mirror) -> [String] {`
`69`		`- return mirror.children.flatMap { $0.label } + values(mirror: mirror)`
	`69`	`+ return mirror.children.compactMap { $0.label } + values(mirror: mirror)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`private func checkArray(object: Any) -> [String] {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ open class YNSearchListView: UITableView, UITableViewDelegate, UITableViewDataSo`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- public override init(frame: CGRect, style: UITableViewStyle) {`
	`32`	`+ public override init(frame: CGRect, style: UITableView.Style) {`
`33`	`33`	`super.init(frame: frame, style: style)`
`34`	`34`	`self.initView()`
`35`	`35`	`}`