Upgrade to Swift5

ml-archive · Mar 27, 2019 · f3aa715 · f3aa715
1 parent d5ec01a
commit f3aa715
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 35 deletions.
diff --git a/Serpent/Serpent.xcodeproj/project.pbxproj b/Serpent/Serpent.xcodeproj/project.pbxproj
@@ -699,16 +699,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Nodes;
 				TargetAttributes = {
 					272F1DC51C6A392A0098F620 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 					};
 					272F1DCF1C6A392A0098F620 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 					};
 					2732EC8C1C9F21A500BFD4E1 = {
 						CreatedOnToolsVersion = 7.2.1;
@@ -734,10 +734,11 @@
 			};
 			buildConfigurationList = 272F1DC01C6A392A0098F620 /* Build configuration list for PBXProject "Serpent" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 272F1DBC1C6A392A0098F620;
 			productRefGroup = 272F1DC71C6A392A0098F620 /* Products */;
@@ -1029,6 +1030,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1093,6 +1095,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1165,8 +1168,7 @@
 				PRODUCT_NAME = Serpent;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1187,8 +1189,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nodes.Serpent;
 				PRODUCT_NAME = Serpent;
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1203,8 +1204,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nodes.SerpentTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REEXPORTED_LIBRARY_PATHS = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1219,8 +1219,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nodes.SerpentTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REEXPORTED_LIBRARY_PATHS = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Serpent/Serpent.xcodeproj/xcshareddata/xcschemes/Serpent OSX.xcscheme b/Serpent/Serpent.xcodeproj/xcshareddata/xcschemes/Serpent OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Serpent/Serpent.xcodeproj/xcshareddata/xcschemes/Serpent iOS.xcscheme b/Serpent/Serpent.xcodeproj/xcshareddata/xcschemes/Serpent iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Serpent/Serpent.xcodeproj/xcshareddata/xcschemes/Serpent tvOS.xcscheme b/Serpent/Serpent.xcodeproj/xcshareddata/xcschemes/Serpent tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Serpent/Serpent.xcodeproj/xcshareddata/xcschemes/Serpent watchOS.xcscheme b/Serpent/Serpent.xcodeproj/xcshareddata/xcschemes/Serpent watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Serpent/Serpent/Classes/Extensions/AlamofireExtension.swift b/Serpent/Serpent/Classes/Extensions/AlamofireExtension.swift
@@ -54,7 +54,7 @@ public extension Parser {
      The default unwrapper. Default implementation just passes data straight through. 
      */
 
-    public static var defaultUnwrapper: Unwrapper = { a, b in return a }
+    static var defaultUnwrapper: Unwrapper = { a, b in return a }
 }
 
 
@@ -74,7 +74,7 @@ public extension Alamofire.DataRequest
      - returns: The request
      */
     @discardableResult
-    public func responseSerializable<T:Decodable>(_ completionHandler: @escaping (DataResponse<T>) -> Void,
+    func responseSerializable<T:Decodable>(_ completionHandler: @escaping (DataResponse<T>) -> Void,
                                      unwrapper:@escaping Parser.Unwrapper = Parser.defaultUnwrapper) -> Self {
         let serializer = Parser.serializer { (data: Any?) -> T? in
 
@@ -104,7 +104,7 @@ public extension Alamofire.DataRequest
      - returns: The request
      */
 	@discardableResult
-    public func responseSerializable<T:Decodable>(_ completionHandler: @escaping (DataResponse<[T]>) -> Void,
+    func responseSerializable<T:Decodable>(_ completionHandler: @escaping (DataResponse<[T]>) -> Void,
                                      unwrapper:@escaping Parser.Unwrapper = Parser.defaultUnwrapper) -> Self {
 
         let serializer = Parser.serializer { (data: Any?) -> [T]? in
@@ -129,7 +129,7 @@ public extension Alamofire.DataRequest
      */
 
 	@discardableResult
-    public func responseSerializable(_ completionHandler: @escaping (DataResponse<NilSerializable>) -> Void) -> Self {
+    func responseSerializable(_ completionHandler: @escaping (DataResponse<NilSerializable>) -> Void) -> Self {
         return validate().responseJSON(completionHandler: completionHandler)
     }
 

diff --git a/Serpent/Serpent/Classes/Extensions/CashierExtension.swift b/Serpent/Serpent/Classes/Extensions/CashierExtension.swift
@@ -18,7 +18,7 @@ public extension Cashier {
 	- object: Generic type which confroms with `Serializable`.
 	- key: Key as a `String`.
 	*/
-	public func setSerializable<T>(_ object: T, forKey key: String) where T: Serializable {
+    func setSerializable<T>(_ object: T, forKey key: String) where T: Serializable {
 		let box = BridgingBox(object)
 		self.setObject(box, forKey: key)
 		BridgingBox.sharedBoxCache[self.id+key] = object
@@ -31,7 +31,7 @@ public extension Cashier {
 	- object: Generic type which confroms with `_ArrayType`.
 	- key: Key as a `String`.
 	*/
-	public func setSerializable<T>(_ object: T, forKey key: String) where T: Sequence, T.Iterator.Element: Serializable {
+    func setSerializable<T>(_ object: T, forKey key: String) where T: Sequence, T.Iterator.Element: Serializable {
 		let boxedArray = object.map { BridgingBox($0) }
 		self.setObject(boxedArray, forKey: key)
 		BridgingBox.sharedBoxCache[self.id+key] = object
@@ -47,7 +47,7 @@ public extension Cashier {
 	- Parameter key: `Key` for `BridgingBox` or `objectForKey` as `String`.
 	- Returns: Generic type stored value/object that conforms with `Serializable` or return `nil`.
 	*/
-	public func serializableForKey<T>(_ key: String) -> T? where T:Serializable {
+    func serializableForKey<T>(_ key: String) -> T? where T:Serializable {
 		if let cachedSerializable = BridgingBox.sharedBoxCache[self.id+key] as? T {
 			return self.object(forKeyIsValid: key) ? cachedSerializable : nil
 		}
@@ -72,7 +72,7 @@ public extension Cashier {
 	- Parameter key: `Key` for `BridgingBox` as `String`.
 	- Returns: Array that holds object that conforms with `Serializable` or return `nil`.
 	*/
-	public func serializableForKey<T>(_ key: String) -> [T]? where T:Serializable {
+    func serializableForKey<T>(_ key: String) -> [T]? where T:Serializable {
 		if let cachedSerializable = BridgingBox.sharedBoxCache[self.id+key] as? [T] {
 			return self.object(forKeyIsValid: key) ? cachedSerializable : nil
 		}
@@ -100,7 +100,7 @@ public extension Cashier {
 	- parameter purgeMemoryCaches: If set to `true`, it will also purge all memory caches, including
 	the shared bridging box cache for objects adhering to `Serializable`.
 	*/
-	public func clearAllData(_ purgeMemoryCaches: Bool) {
+    func clearAllData(_ purgeMemoryCaches: Bool) {
 		self.clearAllData()
 
 		if purgeMemoryCaches {
@@ -114,7 +114,7 @@ public extension Cashier {
 	- parameter key: `Key` for `BridgingBox` as `String`.
 	- parameter purgeMemoryCache: If set to `true`, it will also purge the memory cache.
 	*/
-	public func deleteSerializableForKey(_ key: String, purgeMemoryCache purge: Bool = true) {
+    func deleteSerializableForKey(_ key: String, purgeMemoryCache purge: Bool = true) {
 		if purge {
 			BridgingBox.sharedBoxCache.removeValue(forKey: self.id+key)
 		}

diff --git a/Serpent/Serpent/Classes/Extensions/Extensions.swift b/Serpent/Serpent/Classes/Extensions/Extensions.swift
@@ -105,7 +105,7 @@ public extension Sequence where Iterator.Element:Encodable {
 // MARK: RawRepresentable
 
 public extension RawRepresentable {
-	public func encodableRepresentation() -> RawValue {
+    func encodableRepresentation() -> RawValue {
 		return self.rawValue
 	}
 }

diff --git a/Serpent/Serpent/Classes/Serpent.swift b/Serpent/Serpent/Classes/Serpent.swift
@@ -25,7 +25,7 @@ public protocol Decodable {
 }
 
 public extension Decodable {
-    public static func array(_ source: Any?) -> [Self] {
+    static func array(_ source: Any?) -> [Self] {
         guard let source = source as? [NSDictionary] else {
             return [Self]()
         }
@@ -53,7 +53,7 @@ public extension Keymappable {
 
      - returns: A mapped object conforming to *Serializable*, or nil if parsing failed
      */
-    public func mapped<T>(_ dictionary: NSDictionary?, key: String) -> T? where T:Decodable {
+    func mapped<T>(_ dictionary: NSDictionary?, key: String) -> T? where T:Decodable {
 
         // Ensure the dictionary is not nil
         guard let dict = dictionary else { return nil }
@@ -77,7 +77,7 @@ public extension Keymappable {
 
      - returns: An array of mapped objects conforming to *Serializable*, or an empty array if parsing failed.
      */
-    public func mapped<T>(_ dictionary: NSDictionary?, key: String) -> T? where T:Sequence, T.Iterator.Element: Decodable {
+    func mapped<T>(_ dictionary: NSDictionary?, key: String) -> T? where T:Sequence, T.Iterator.Element: Decodable {
         // Ensure the dictionary is not nil and get the value from the dictionary for our key
         guard let dict = dictionary, let sourceOpt = dict[key] else { return nil }
 
@@ -103,7 +103,7 @@ public extension Keymappable {
 
      - returns: The value of primitive type `T` or `nil` if parsing was unsuccessful.
      */
-    public func mapped<T>(_ dictionary: NSDictionary?, key: String) -> T? {
+    func mapped<T>(_ dictionary: NSDictionary?, key: String) -> T? {
 
         // Ensure the dictionary is not nil
         guard let dict = dictionary else { return nil }
@@ -159,7 +159,7 @@ public extension Keymappable {
 
      - returns: The value of type `T` or `nil` if parsing was unsuccessful.
      */
-    public func mapped<T:StringInitializable>(_ dictionary: NSDictionary?, key: String) -> T? {
+    func mapped<T:StringInitializable>(_ dictionary: NSDictionary?, key: String) -> T? {
         if let dict = dictionary, let source = dict[key] as? String , source.isEmpty == false {
             return T.fromString(source)
         }
@@ -184,7 +184,7 @@ public extension Keymappable {
      - returns: The enumeration of enum type `T` or `nil` if parsing was unsuccessful or
      enumeration does not exist.
      */
-    public func mapped<T:RawRepresentable>(_ dictionary: NSDictionary?, key: String) -> T? {
+    func mapped<T:RawRepresentable>(_ dictionary: NSDictionary?, key: String) -> T? {
         guard let source: T.RawValue = self.mapped(dictionary, key: key) else {
             return nil
         }
@@ -205,7 +205,7 @@ public extension Keymappable {
 
      - returns: An array of enum type `T` or an empty array if parsing was unsuccessful.
      */
-    public func mapped<T>(_ dictionary: NSDictionary?, key: String) -> T? where T:Sequence, T.Iterator.Element: RawRepresentable {
+    func mapped<T>(_ dictionary: NSDictionary?, key: String) -> T? where T:Sequence, T.Iterator.Element: RawRepresentable {
         if let dict = dictionary, let source = dict[key] as? [T.Iterator.Element.RawValue] {
             let finalArray = source.map { T.Iterator.Element.init(rawValue: $0)! }
             return (finalArray as! T)
@@ -229,7 +229,7 @@ public extension Keymappable {
 
 	- returns: The value of type `T` or `nil` if parsing was unsuccessful.
 	*/
-	public func mapped<T: HexInitializable>(_ dictionary: NSDictionary?, key: String) -> T? {
+    func mapped<T: HexInitializable>(_ dictionary: NSDictionary?, key: String) -> T? {
 		guard let dict = dictionary, let source = dict[key] else {
 			return nil
 		}