Upgrade to swift 5

khoren93 · Jun 21, 2019 · b9bb86c · b9bb86c
1 parent 1617e9a
commit b9bb86c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/SwiftHub.xcodeproj/project.pbxproj b/SwiftHub.xcodeproj/project.pbxproj
@@ -1466,7 +1466,7 @@
 					A09499511E1D1CB600EFDE29 = {
 						CreatedOnToolsVersion = 8.2;
 						DevelopmentTeam = RE853S4FBU;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Automatic;
 					};
 					A09499651E1D1CB700EFDE29 = {
@@ -1485,10 +1485,9 @@
 			};
 			buildConfigurationList = A094994D1E1D1CB600EFDE29 /* Build configuration list for PBXProject "SwiftHub" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 				ru,
@@ -1796,7 +1795,7 @@
 			);
 			name = R.swift;
 			outputPaths = (
-				"$SRCROOT/SwiftHub/Resources/R.generated.swift",
+				$SRCROOT/SwiftHub/Resources/R.generated.swift,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -2252,7 +2251,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.public.SwiftHub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -2270,7 +2269,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.public.SwiftHub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

diff --git a/SwiftHub/Managers/ContactsManager.swift b/SwiftHub/Managers/ContactsManager.swift
@@ -67,6 +67,7 @@ class ContactsManager: NSObject {
                     single(.error(error))
                     logError(error.localizedDescription)
                 }
+            @unknown default: break
             }
             return Disposables.create { }
             }.asObservable()

diff --git a/SwiftHub/Managers/LogManager.swift b/SwiftHub/Managers/LogManager.swift
@@ -11,23 +11,23 @@ import CocoaLumberjack
 import RxSwift
 
 public func logDebug(_ message: @autoclosure () -> String) {
-    DDLogDebug(message)
+    DDLogDebug(message())
 }
 
 public func logError(_ message: @autoclosure () -> String) {
-    DDLogError(message)
+    DDLogError(message())
 }
 
 public func logInfo(_ message: @autoclosure () -> String) {
-    DDLogInfo(message)
+    DDLogInfo(message())
 }
 
 public func logVerbose(_ message: @autoclosure () -> String) {
-    DDLogVerbose(message)
+    DDLogVerbose(message())
 }
 
 public func logWarn(_ message: @autoclosure () -> String) {
-    DDLogWarn(message)
+    DDLogWarn(message())
 }
 
 public func logResourcesCount() {

diff --git a/SwiftHub/Modules/Contacts/ContactsViewController.swift b/SwiftHub/Modules/Contacts/ContactsViewController.swift
@@ -91,6 +91,7 @@ extension ContactsViewController: MFMessageComposeViewControllerDelegate {
         case .failed:
             analytics.log(.userInvited(success: false))
         case .cancelled: break
+        @unknown default: break
         }
         controller.dismiss(animated: true, completion: nil)
     }