swift 4 fixes

Author: ddLesha

Scorocode.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = 'Scorocode'
-  s.version          = '1.02'
-  s.summary          = 'Scorocode ios SDK, swift 3'
+  s.version          = '1.03'
+  s.summary          = 'Scorocode ios SDK, swift 4'
 
   s.description      = <<-DESC
 SDK предоставляет доступ к платформе Scorocode для построения приложений, основанных на swift. 

ScorocodeTests/TestSCAPI.swift

@@ -375,8 +375,7 @@ class TestSCAPI: XCTestCase {
         let exp = expectation(description: "Scripts")
 
         // TODO: успешное выполнение
-        
-        SCAPI.sharedInstance.runScript("abc", pool: [:], debug: false) {
+        SCAPI.sharedInstance.runScript(scriptId: "abc", scriptPath: nil, pool: [:], debug: false) {
             success, error in
 
             assertError(success: success, error: error, result: nil)

ScorocodeTests/TestSCUser.swift

@@ -71,7 +71,7 @@ class TestSCUser: XCTestCase {
 
             XCTAssertNotNil(result!["sessionId"])
 
-            SCUser.logout() {
+            user.logout() {
                 success, error in
 
                 XCTAssertTrue(success)

todolist.xcodeproj/project.pbxproj

@@ -347,14 +347,14 @@
 					622100EC1EE05986002664DD = {
 						CreatedOnToolsVersion = 8.3;
 						DevelopmentTeam = Q9F94SAMUV;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 6277357F1DBFD92300CFC713;
 					};
 					6277357F1DBFD92300CFC713 = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = Q9F94SAMUV;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
@@ -528,7 +528,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.scorocode.scorocodeTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/todolist.app/todolist";
 			};
 			name = Debug;
@@ -545,7 +546,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scorocode.scorocodeTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/todolist.app/todolist";
 			};
 			name = Release;
@@ -677,7 +679,8 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -696,7 +699,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

todolist/AppDelegate.swift

@@ -35,11 +35,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
 
         //scorocode init
-        let applicationId = "0b0fdf86cf064d118f2df6ca485937af"
-        let clientId = "adeb3bf2410d488bbf57dede2812f3ee"
-        let accessKey = "b28b2afa06e24ad481aa358b23210a73"
-        let fileKey = "3824781956324a7a81025d7e6594d901"
-        let messageKey = "9de581d126554bf2bf304f3dd7af2142"
+        let applicationId = "0b0adf87cf064d118f2df6ca485937af"
+        let clientId = "adeb3bf8810d388bbf57dede2812f3ee"
+        let accessKey = "b28b2afa05e14ad481aa358b23210a73"
+        let fileKey = "3824781938324a8a81025d7e6594d901"
+        let messageKey = "9de581f126354bf2bf304f3dd7af2142"
         SC.initWith(applicationId: applicationId, clientId: clientId, accessKey: accessKey, fileKey: fileKey, messageKey: messageKey)
 
         // Check if launched from notification

todolist/Extensions.swift

@@ -34,7 +34,7 @@ extension UIViewController {
     }
 
     // resize view on show keyboard
-    func keyboardWillShowForResizing(notification: Notification) {
+    @objc func keyboardWillShowForResizing(notification: Notification) {
         if let keyboardSize = (notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue,
             let window = self.view.window?.frame {
             self.view.frame = CGRect(x: self.view.frame.origin.x,
@@ -47,7 +47,7 @@ extension UIViewController {
     }
 
     // resize view on hide keyboard
-    func keyboardWillHideForResizing(notification: Notification) {
+    @objc func keyboardWillHideForResizing(notification: Notification) {
         if let keyboardSize = (notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue {
             let viewHeight = self.view.frame.height
             self.view.frame = CGRect(x: self.view.frame.origin.x,
@@ -68,7 +68,7 @@ extension UIViewController {
         view.addGestureRecognizer(tap)
     }
 
-    func dismissKeyboard() {
+    @objc func dismissKeyboard() {
         view.endEditing(true)
     }
 }

todolist/SCLib/BSON/bson.swift

@@ -127,5 +127,9 @@ func dictionaryFromBSONBytes(byteArray: [UInt8]) -> [String:Any] {
 
 func arrayFromBSONBytes(byteArray: [UInt8]) -> [Any] {
     let dictionary = dictionaryFromBSONBytes(byteArray: byteArray)
-    return dictionary.sorted(by: { Int($0.0.0)! < Int($0.1.0)! }).map({$0.1})
+    return dictionary.sorted(by: { (a, b) -> Bool in
+        return a.key < b.key
+    }).map({ (a) -> Any in
+        return a.value
+    })
 }

todolist/SCLib/Model/SC.swift

@@ -11,6 +11,7 @@ import Foundation
 public class SC {
 
     public class func initWith(applicationId: String, clientId: String, accessKey: String, fileKey: String, messageKey: String) {
+        
         SCAPI.sharedInstance.applicationId = applicationId
         SCAPI.sharedInstance.clientId = clientId
         SCAPI.sharedInstance.accessKey = accessKey