remirobert · kevin49999 · Nov 2, 2017
diff --git a/Example/ExampleDotzu/ExampleDotzu.xcodeproj/project.pbxproj b/Example/ExampleDotzu/ExampleDotzu.xcodeproj/project.pbxproj
@@ -120,7 +120,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Remi Robert";
 				TargetAttributes = {
 					BBF9FA561ECB9041003227BE = {
@@ -198,15 +198,21 @@
 				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_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_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;
@@ -249,15 +255,21 @@
 				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_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_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;

diff --git a/Framework/Dotzu/Dotzu.xcodeproj/project.pbxproj b/Framework/Dotzu/Dotzu.xcodeproj/project.pbxproj
@@ -406,7 +406,7 @@
 					New,
 				);
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Remi Robert";
 				TargetAttributes = {
 					BBF9F9331ECB8A38003227BE = {
@@ -418,6 +418,7 @@
 					BBF9F93C1ECB8A39003227BE = {
 						CreatedOnToolsVersion = 8.3.2;
 						DevelopmentTeam = 44Q2J6374R;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -562,15 +563,21 @@
 				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_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_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;
@@ -616,15 +623,21 @@
 				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_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_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;
@@ -670,7 +683,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -690,7 +703,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.remirobert.Dotzu;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Framework/Dotzu/Dotzu.xcodeproj/xcshareddata/xcschemes/Dotzu.xcscheme b/Framework/Dotzu/Dotzu.xcodeproj/xcshareddata/xcschemes/Dotzu.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   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>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Framework/Dotzu/Dotzu/CrashListTableViewCell.swift b/Framework/Dotzu/Dotzu/CrashListTableViewCell.swift
@@ -25,12 +25,12 @@ class CrashListTableViewCell: UITableViewCell, LogCellProtocol {
         textview.text = content
         let attstr = NSMutableAttributedString(string: content)
 
-        attstr.addAttribute(NSForegroundColorAttributeName,
+        attstr.addAttribute(NSAttributedStringKey.foregroundColor,
                             value: UIColor.white, range: NSMakeRange(0, content.characters.count))
         if LogsSettings.shared.date {
             let range = NSMakeRange(0, formatDate.characters.count)
-            attstr.addAttribute(NSForegroundColorAttributeName, value: Color.mainGreen, range: range)
-            attstr.addAttribute(NSFontAttributeName, value: UIFont.boldSystemFont(ofSize: 12), range: range)
+            attstr.addAttribute(NSAttributedStringKey.foregroundColor, value: Color.mainGreen, range: range)
+            attstr.addAttribute(NSAttributedStringKey.font, value: UIFont.boldSystemFont(ofSize: 12), range: range)
         }
         textview.attributedText = attstr
     }

diff --git a/Framework/Dotzu/Dotzu/LogNavigationViewController.swift b/Framework/Dotzu/Dotzu/LogNavigationViewController.swift
@@ -14,8 +14,8 @@ class LogNavigationViewController: UINavigationController {
         super.viewDidLoad()
 
         navigationBar.tintColor = Color.mainGreen
-        navigationBar.titleTextAttributes = [NSFontAttributeName: UIFont.boldSystemFont(ofSize: 20),
-                                             NSForegroundColorAttributeName: Color.mainGreen]
+        navigationBar.titleTextAttributes = [NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 20),
+                                             NSAttributedStringKey.foregroundColor: Color.mainGreen]
 
         let selector = #selector(LogNavigationViewController.exit)
 

diff --git a/Framework/Dotzu/Dotzu/LogNetworkTableViewCell.swift b/Framework/Dotzu/Dotzu/LogNetworkTableViewCell.swift
@@ -29,16 +29,16 @@ class LogNetworkTableViewCell: UITableViewCell, LogCellProtocol {
 
         let attstr = NSMutableAttributedString(string: stringContent)
 
-        attstr.addAttribute(NSForegroundColorAttributeName, value: UIColor.white,
+        attstr.addAttribute(NSAttributedStringKey.foregroundColor, value: UIColor.white,
                             range: NSMakeRange(0, stringContent.characters.count))
         if LogsSettings.shared.date {
             let range = NSMakeRange(0, formatDate.characters.count)
-            attstr.addAttribute(NSForegroundColorAttributeName, value: Color.mainGreen, range: range)
-            attstr.addAttribute(NSFontAttributeName, value: UIFont.boldSystemFont(ofSize: 12), range: range)
+            attstr.addAttribute(NSAttributedStringKey.foregroundColor, value: Color.mainGreen, range: range)
+            attstr.addAttribute(NSAttributedStringKey.font, value: UIFont.boldSystemFont(ofSize: 12), range: range)
         }
         let range = NSMakeRange(formatDate.characters.count, request.method.characters.count + 2)
-        attstr.addAttribute(NSForegroundColorAttributeName, value: UIColor.lightGray, range: range)
-        attstr.addAttribute(NSFontAttributeName, value: UIFont.boldSystemFont(ofSize: 17), range: range)
+        attstr.addAttribute(NSAttributedStringKey.foregroundColor, value: UIColor.lightGray, range: range)
+        attstr.addAttribute(NSAttributedStringKey.font, value: UIFont.boldSystemFont(ofSize: 17), range: range)
         textViewContent.attributedText = attstr
 
         labelCode.text = "\(request.code)"

diff --git a/Framework/Dotzu/Dotzu/LogResponseBodyViewModel.swift b/Framework/Dotzu/Dotzu/LogResponseBodyViewModel.swift
@@ -16,10 +16,10 @@ class LogResponseBodyViewModel {
         do {
             let json = try JSONSerialization.jsonObject(with: data as Data, options: .mutableContainers)
             let pretty = try JSONSerialization.data(withJSONObject: json,   options: .prettyPrinted)
-            let prettyString = NSString(data: pretty, encoding: String.Encoding.utf8.rawValue) as? String
+            let prettyString = NSString(data: pretty, encoding: String.Encoding.utf8.rawValue) as String?
             return prettyString?.replacingOccurrences(of: "\\/", with: "/")
         } catch {
-            return NSString(data: data as Data, encoding: String.Encoding.utf8.rawValue) as? String
+            return NSString(data: data as Data, encoding: String.Encoding.utf8.rawValue) as String?
         }
     }
 

diff --git a/Framework/Dotzu/Dotzu/LoggerFormat.swift b/Framework/Dotzu/Dotzu/LoggerFormat.swift
@@ -35,18 +35,18 @@ class LoggerFormat {
         }
 
         let attstr = NSMutableAttributedString(string: stringContent as String)
-        attstr.addAttribute(NSForegroundColorAttributeName,
+        attstr.addAttribute(NSAttributedStringKey.foregroundColor,
                             value: UIColor.white,
                             range: NSMakeRange(0, stringContent.length))
         if let dateLenght = lenghtDate {
             let range = NSMakeRange(0, dateLenght)
-            attstr.addAttribute(NSForegroundColorAttributeName, value: Color.mainGreen, range: range)
-            attstr.addAttribute(NSFontAttributeName, value: UIFont.boldSystemFont(ofSize: 12), range: range)
+            attstr.addAttribute(NSAttributedStringKey.foregroundColor, value: Color.mainGreen, range: range)
+            attstr.addAttribute(NSAttributedStringKey.font, value: UIFont.boldSystemFont(ofSize: 12), range: range)
         }
         if let fileInfoString = log.fileInfo, LogsSettings.shared.fileInfo {
             let range = NSMakeRange(startIndex, fileInfoString.characters.count)
-            attstr.addAttribute(NSForegroundColorAttributeName, value: UIColor.gray, range: range)
-            attstr.addAttribute(NSFontAttributeName, value: UIFont.boldSystemFont(ofSize: 12), range: range)
+            attstr.addAttribute(NSAttributedStringKey.foregroundColor, value: UIColor.gray, range: range)
+            attstr.addAttribute(NSAttributedStringKey.font, value: UIFont.boldSystemFont(ofSize: 12), range: range)
         }
         return (stringContent as String, attstr)
     }

diff --git a/Framework/Dotzu/Dotzu/LoggerNetwork.swift b/Framework/Dotzu/Dotzu/LoggerNetwork.swift
@@ -13,8 +13,7 @@ fileprivate var bodyValues = [String:Data]()
 extension NSMutableURLRequest {
 
     @objc class func httpBodyHackSwizzle() {
-        let setHttpBody = class_getInstanceMethod(self, #selector(setter: NSMutableURLRequest.httpBody))
-        let httpBodyHackSetHttpBody = class_getInstanceMethod(self, #selector(self.httpBodyHackSetHttpBody(body:)))
+        guard let setHttpBody = class_getInstanceMethod(self, #selector(setter: NSMutableURLRequest.httpBody)), let httpBodyHackSetHttpBody = class_getInstanceMethod(self, #selector(self.httpBodyHackSetHttpBody(body:))) else { return }
         method_exchangeImplementations(setHttpBody, httpBodyHackSetHttpBody)
     }
 

diff --git a/Framework/Dotzu/Dotzu/StoreManager.swift b/Framework/Dotzu/Dotzu/StoreManager.swift
@@ -39,7 +39,7 @@ class StoreManager<T> where T: NSCoding {
     }
 
     func logs() -> [T] {
-        guard let data = UserDefaults.standard.object(forKey: store.rawValue) as? NSData else {return []}
+        guard let data = UserDefaults.standard.object(forKey: store.rawValue) as? Data else {return []}
         do {
             let dataArchive = try NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data)
             return dataArchive as? [T] ?? []