Converting project to support swift4

hackiftekhar · Sep 21, 2017 · 459e269 · 459e269
1 parent 7f478df
commit 459e269
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 55 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/Demo.xcodeproj/project.pbxproj b/Demo.xcodeproj/project.pbxproj
@@ -806,7 +806,7 @@
 					C0ACB0F419CF104B0057B571 = {
 						CreatedOnToolsVersion = 6.0.1;
 						DevelopmentTeam = 7UUTF6T5P9;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 0900;
 					};
 					C0B63B9A1781FAB1008D3B64 = {
 						DevelopmentTeam = 7UUTF6T5P9;
@@ -1163,7 +1163,8 @@
 				PRODUCT_NAME = DemoSwift;
 				SWIFT_OBJC_BRIDGING_HEADER = "Demo/Swift_Demo/Resources/IQKeyboardManger-Swift-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1194,7 +1195,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.iftekhar.IQKeyboardManagerSwift;
 				PRODUCT_NAME = DemoSwift;
 				SWIFT_OBJC_BRIDGING_HEADER = "Demo/Swift_Demo/Resources/IQKeyboardManger-Swift-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Demo/Objective_C_Demo/ViewController/Settings/SettingsViewController.m b/Demo/Objective_C_Demo/ViewController/Settings/SettingsViewController.m
@@ -24,9 +24,9 @@ @interface SettingsViewController ()<OptionsViewControllerDelegate,ColorPickerTe
 
 @implementation SettingsViewController
 {
-    NSArray *sectionTitles;
-    NSArray *keyboardManagerProperties;
-    NSArray *keyboardManagerPropertyDetails;
+    NSArray<NSString*> *sectionTitles;
+    NSArray<NSArray*> *keyboardManagerProperties;
+    NSArray<NSArray*> *keyboardManagerPropertyDetails;
 
     NSIndexPath *selectedIndexPathForOptions;
 }

diff --git a/Demo/Swift_Demo/ViewController/ChatViewController.swift b/Demo/Swift_Demo/ViewController/ChatViewController.swift
@@ -70,7 +70,7 @@ class ChatViewController: UIViewController, UITableViewDataSource,UITableViewDel
         }
     }
 
-    func textFieldDidChange(_ notification: Notification) {
+    @objc func textFieldDidChange(_ notification: Notification) {
         buttonSend.isEnabled = inputTextField.text?.characters.count != 0
     }
 

diff --git a/Demo/Swift_Demo/ViewController/ManualToolbarViewController.swift b/Demo/Swift_Demo/ViewController/ManualToolbarViewController.swift
@@ -39,7 +39,7 @@ class ManualToolbarViewController : UIViewController, UIPopoverPresentationContr
     }
 
 
-    func previousAction(_ sender : UITextField!) {
+    @objc func previousAction(_ sender : UITextField!) {
 
         if (textField2.isFirstResponder)
         {
@@ -51,7 +51,7 @@ class ManualToolbarViewController : UIViewController, UIPopoverPresentationContr
         }
     }
 
-    func nextAction(_ sender : UITextField!) {
+    @objc func nextAction(_ sender : UITextField!) {
 
         if (textField1.isFirstResponder)
         {
@@ -63,11 +63,11 @@ class ManualToolbarViewController : UIViewController, UIPopoverPresentationContr
         }
     }
 
-    func doneAction(_ sender : UITextField!) {
+    @objc func doneAction(_ sender : UITextField!) {
         self.view.endEditing(true)
     }
 
-    func titleAction(_ sender : UIButton) {
+    @objc func titleAction(_ sender : UIButton) {
 
         let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
         alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))

diff --git a/Demo/Swift_Demo/ViewController/SettingsViewController.swift b/Demo/Swift_Demo/ViewController/SettingsViewController.swift
@@ -40,48 +40,48 @@ class SettingsViewController: UITableViewController, OptionsViewControllerDelega
     }
 
     /**  UIKeyboard Handling    */
-    func enableAction (_ sender: UISwitch) {
+    @objc func enableAction (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().enable = sender.isOn
 
         self.tableView.reloadSections(IndexSet(integer: 0), with: UITableViewRowAnimation.fade)
     }
 
-    func keyboardDistanceFromTextFieldAction (_ sender: UIStepper) {
+    @objc func keyboardDistanceFromTextFieldAction (_ sender: UIStepper) {
 
         IQKeyboardManager.sharedManager().keyboardDistanceFromTextField = CGFloat(sender.value)
 
         self.tableView.reloadRows(at: [IndexPath(row: 1, section: 0)], with: UITableViewRowAnimation.none)
     }
 
-    func preventShowingBottomBlankSpaceAction (_ sender: UISwitch) {
+    @objc func preventShowingBottomBlankSpaceAction (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().preventShowingBottomBlankSpace = sender.isOn
 
         self.tableView.reloadSections(IndexSet(integer: 0), with: UITableViewRowAnimation.fade)
     }
 
     /**  IQToolbar handling     */
-    func enableAutoToolbarAction (_ sender: UISwitch) {
+    @objc func enableAutoToolbarAction (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().enableAutoToolbar = sender.isOn
 
         self.tableView.reloadSections(IndexSet(integer: 1), with: UITableViewRowAnimation.fade)
     }
 
-    func shouldToolbarUsesTextFieldTintColorAction (_ sender: UISwitch) {
+    @objc func shouldToolbarUsesTextFieldTintColorAction (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().shouldToolbarUsesTextFieldTintColor = sender.isOn
     }
 
-    func shouldShowTextFieldPlaceholder (_ sender: UISwitch) {
+    @objc func shouldShowTextFieldPlaceholder (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().shouldShowToolbarPlaceholder = sender.isOn
 
         self.tableView.reloadSections(IndexSet(integer: 1), with: UITableViewRowAnimation.fade)
     }
 
-    func toolbarDoneBarButtonItemImage (_ sender: UISwitch) {
+    @objc func toolbarDoneBarButtonItemImage (_ sender: UISwitch) {
 
         if sender.isOn {
             IQKeyboardManager.sharedManager().toolbarDoneBarButtonItemImage = UIImage(named:"IQButtonBarArrowDown")
@@ -93,27 +93,27 @@ class SettingsViewController: UITableViewController, OptionsViewControllerDelega
     }
 
     /**  "Keyboard appearance overriding    */
-    func overrideKeyboardAppearanceAction (_ sender: UISwitch) {
+    @objc func overrideKeyboardAppearanceAction (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().overrideKeyboardAppearance = sender.isOn
 
         self.tableView.reloadSections(IndexSet(integer: 2), with: UITableViewRowAnimation.fade)
     }
 
     /**  Resign first responder handling    */
-    func shouldResignOnTouchOutsideAction (_ sender: UISwitch) {
+    @objc func shouldResignOnTouchOutsideAction (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().shouldResignOnTouchOutside = sender.isOn
     }
 
     /**  Sound handling         */
-    func shouldPlayInputClicksAction (_ sender: UISwitch) {
+    @objc func shouldPlayInputClicksAction (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().shouldPlayInputClicks = sender.isOn
     }
 
     /**  Debugging         */
-    func enableDebugging (_ sender: UISwitch) {
+    @objc func enableDebugging (_ sender: UISwitch) {
 
         IQKeyboardManager.sharedManager().enableDebugging = sender.isOn
     }

diff --git a/Demo/Swift_Demo/ViewController/TextFieldViewController.swift b/Demo/Swift_Demo/ViewController/TextFieldViewController.swift
@@ -20,15 +20,15 @@ class TextFieldViewController: UIViewController, UITextViewDelegate, UIPopoverPr
     @IBOutlet fileprivate var buttonPush : UIButton!
     @IBOutlet fileprivate var buttonPresent : UIButton!
 
-    func previousAction(_ sender : UITextField) {
+    @objc func previousAction(_ sender : UITextField) {
         print("PreviousAction")
     }
 
-    func nextAction(_ sender : UITextField) {
+    @objc func nextAction(_ sender : UITextField) {
         print("nextAction")
     }
 
-    func doneAction(_ sender : UITextField) {
+    @objc func doneAction(_ sender : UITextField) {
         print("doneAction")
     }
 

diff --git a/Demo/Swift_Demo/ViewController/YYTextViewController.swift b/Demo/Swift_Demo/ViewController/YYTextViewController.swift
@@ -13,14 +13,11 @@ class YYTextViewController: UIViewController, YYTextViewDelegate {
 
     @IBOutlet var textView : YYTextView!
 
-    override internal class func initialize() {
-        super.initialize()
+    override func viewDidLoad() {
+        super.viewDidLoad()
 
         IQKeyboardManager.sharedManager().registerTextFieldViewClass(YYTextView.self, didBeginEditingNotificationName: Notification.Name.YYTextViewTextDidBeginEditing.rawValue, didEndEditingNotificationName: Notification.Name.YYTextViewTextDidEndEditing.rawValue)
-    }
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
         textView.placeholderText = "This is placeholder text of YYTextView"
     }
 

diff --git a/IQKeyboardManager.xcodeproj/project.pbxproj b/IQKeyboardManager.xcodeproj/project.pbxproj
@@ -383,7 +383,7 @@
 		4CD2C49D1C5A615600975A7A /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = IQKeyboardManager;
 				TargetAttributes = {
 					4CD2C4A51C5A615600975A7A = {
@@ -487,14 +487,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = 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_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -536,14 +542,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = 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_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -575,6 +587,7 @@
 		4CD2C4AF1C5A615600975A7A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_MODULES_AUTOLINK = NO;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -593,6 +606,7 @@
 		4CD2C4B01C5A615600975A7A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_MODULES_AUTOLINK = NO;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;

diff --git a/IQKeyboardManager.xcodeproj/xcshareddata/xcschemes/IQKeyboardManager.xcscheme b/IQKeyboardManager.xcodeproj/xcshareddata/xcschemes/IQKeyboardManager.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

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