Update syntax and project to Swift 4.

Raureif · Nov 5, 2017 · 2504ced · 2504ced
1 parent dd441b1
commit 2504ced
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/Sources/URL+Wikipedia.swift b/Sources/URL+Wikipedia.swift
@@ -72,7 +72,7 @@ extension URL {
     public func isWikipediaScrollURL() -> Bool {
         let isHostWikipedia = self.host != nil ? self.host!.range(of: ".wikipedia.org") != nil : false
         let pathPointsToSiteRoot = self.path != "" ? self.path == "/" : false
-        let hasHash = self.fragment != nil ? (self.fragment!).characters.count > 0 : false
+        let hasHash = self.fragment != nil ? (self.fragment!).count > 0 : false
         return isHostWikipedia && pathPointsToSiteRoot && hasHash
     }
 

diff --git a/Sources/Wikipedia+MostRead.swift b/Sources/Wikipedia+MostRead.swift
@@ -179,7 +179,7 @@ extension Wikipedia {
             // and cause the NSURLSession to fail.
             // This happens often for languages where Cyrillic is URL-encoded.
             // See https://stackoverflow.com/a/417184
-            titlesString = String(titlesString.characters.prefix(950))
+            titlesString = String(titlesString.prefix(950))
         }
 
         let parameters: [String:String] = [

diff --git a/Sources/WikipediaLanguage.swift b/Sources/WikipediaLanguage.swift
@@ -90,9 +90,9 @@ public struct WikipediaLanguage: Hashable, Equatable {
             if preferredLanguages.count > 0 {
                 var preferredLanguage = preferredLanguages[0]
                 // if the language code is longer than two, we strip the rest
-                if preferredLanguage.characters.count > 2 {
+                if preferredLanguage.count > 2 {
                     let index = preferredLanguage.index(preferredLanguage.startIndex, offsetBy: 2)
-                    preferredLanguage = preferredLanguage.substring(to: index)
+                    preferredLanguage = String(preferredLanguage.prefix(upTo: index))
                 }
                 languageCode = preferredLanguage
             } else {

diff --git a/WikipediaKit.xcodeproj/project.pbxproj b/WikipediaKit.xcodeproj/project.pbxproj
@@ -490,7 +490,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Frank Rausch";
 				TargetAttributes = {
 					274EFCDC1EB899E90047428B = {
@@ -499,18 +499,22 @@
 					};
 					27E365071E81757500F39F78 = {
 						CreatedOnToolsVersion = 8.2.1;
+						LastSwiftMigration = 0910;
 						ProvisioningStyle = Manual;
 					};
 					27E365461E81AC6A00F39F78 = {
 						CreatedOnToolsVersion = 8.2.1;
+						LastSwiftMigration = 0910;
 						ProvisioningStyle = Automatic;
 					};
 					27E365891E81C95D00F39F78 = {
 						CreatedOnToolsVersion = 8.2.1;
+						LastSwiftMigration = 0910;
 						ProvisioningStyle = Automatic;
 					};
 					27E365AB1E81C9E300F39F78 = {
 						CreatedOnToolsVersion = 8.2.1;
+						LastSwiftMigration = 0910;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -767,15 +771,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;
@@ -818,15 +828,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;
@@ -870,7 +886,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.raureif.WikipediaKit;
 				PRODUCT_NAME = WikipediaKit;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -892,7 +908,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.raureif.WikipediaKit;
 				PRODUCT_NAME = WikipediaKit;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -913,7 +929,7 @@
 				PRODUCT_NAME = WikipediaKit;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -935,7 +951,7 @@
 				PRODUCT_NAME = WikipediaKit;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -957,7 +973,7 @@
 				PRODUCT_NAME = WikipediaKit;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -979,7 +995,7 @@
 				PRODUCT_NAME = WikipediaKit;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				VALIDATE_PRODUCT = YES;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1001,7 +1017,7 @@
 				PRODUCT_NAME = WikipediaKit;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1022,7 +1038,7 @@
 				PRODUCT_NAME = WikipediaKit;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;