From 17cab6b9a3260357ba80c38ff091484ed1d7f80b Mon Sep 17 00:00:00 2001
From: Marius Constantinescu <constantinescu.marius@gmail.com>
Date: Thu, 15 Jun 2017 18:01:10 +0300
Subject: [PATCH] Swift 4 update

---
 Codemine.xcodeproj/project.pbxproj            | 37 +++++++++++++++----
 .../xcschemes/Codemine-Mac.xcscheme           |  2 +-
 .../xcschemes/Codemine-tvOS.xcscheme          |  2 +-
 .../xcschemes/Codemine-watchOS.xcscheme       |  2 +-
 .../xcshareddata/xcschemes/Codemine.xcscheme  |  2 +-
 CodemineTests/CodemineTests.swift             |  2 +-
 CodemineTests/URLImageAssetSizeTests.swift    |  2 -
 7 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/Codemine.xcodeproj/project.pbxproj b/Codemine.xcodeproj/project.pbxproj
index 5d91d33..748707c 100644
--- a/Codemine.xcodeproj/project.pbxproj
+++ b/Codemine.xcodeproj/project.pbxproj
@@ -445,7 +445,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = Nodes;
 				TargetAttributes = {
 					01CD40211D071BAE0044887E = {
@@ -465,11 +465,11 @@
 					};
 					275BCA9E1C57D1B500FF3647 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					275BCAA81C57D1B500FF3647 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -761,6 +761,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -782,6 +783,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -831,6 +833,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -853,6 +856,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -879,14 +883,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;
@@ -930,14 +940,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;
@@ -959,6 +975,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -971,6 +988,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -982,7 +1000,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -991,6 +1010,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -1002,7 +1022,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1013,7 +1034,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nodes.CodemineTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1025,7 +1047,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nodes.CodemineTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-Mac.xcscheme b/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-Mac.xcscheme
index ef2844f..caba1f1 100644
--- a/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-Mac.xcscheme
+++ b/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-tvOS.xcscheme b/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-tvOS.xcscheme
index 6eb1901..a7a0417 100644
--- a/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-tvOS.xcscheme
+++ b/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-watchOS.xcscheme b/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-watchOS.xcscheme
index 521d283..721410d 100644
--- a/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-watchOS.xcscheme
+++ b/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine.xcscheme b/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine.xcscheme
index dce6d7f..aff0d44 100644
--- a/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine.xcscheme
+++ b/Codemine.xcodeproj/xcshareddata/xcschemes/Codemine.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CodemineTests/CodemineTests.swift b/CodemineTests/CodemineTests.swift
index 175dcbc..44d20fe 100644
--- a/CodemineTests/CodemineTests.swift
+++ b/CodemineTests/CodemineTests.swift
@@ -52,7 +52,7 @@ class CodemineTests: XCTestCase {
     func testRange() {
         let str = "Hello world!"
 		let range = str.range(from: "e", toString: " w")
-        XCTAssertTrue(range?.lowerBound == str.characters.index(str.startIndex, offsetBy: 1) && range?.upperBound == str.characters.index(str.startIndex, offsetBy: 7), "range = \(range)")
+        XCTAssertTrue(range?.lowerBound == str.characters.index(str.startIndex, offsetBy: 1) && range?.upperBound == str.characters.index(str.startIndex, offsetBy: 7), "range = \(String(describing: range))")
         XCTAssertNil(str.range(from: "a", toString: "e"))
         XCTAssertNil(str.range(from: "e", toString: "b"))
 		
diff --git a/CodemineTests/URLImageAssetSizeTests.swift b/CodemineTests/URLImageAssetSizeTests.swift
index e2e0957..632b6b0 100644
--- a/CodemineTests/URLImageAssetSizeTests.swift
+++ b/CodemineTests/URLImageAssetSizeTests.swift
@@ -37,8 +37,6 @@ class URLImageAssetSizeTests: XCTestCase {
 	func testBadUrl() {
 		let url = URL(string: "http://example.com:-80/")!
 		
-		print(URLComponents(url: url, resolvingAgainstBaseURL: false))
-		
 		let newUrl = url.appendingAssetSize(CGSize(width: 10, height: 10))
 		XCTAssertNil(newUrl?.absoluteString, "Bad URL did not return nil")
 	}