🔧 migrated to Swift 5

matthewcheok · Apr 16, 2019 · 9d31d35 · 9d31d35
1 parent fa20523
commit 9d31d35
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 18 deletions.
diff --git a/JSONCodable.xcodeproj/project.pbxproj b/JSONCodable.xcodeproj/project.pbxproj
@@ -243,11 +243,11 @@
 				TargetAttributes = {
 					9E455BF61BCE185B00070A4F = {
 						CreatedOnToolsVersion = 7.0.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 					};
 					9EDB39051B59D00B00C63019 = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -385,8 +385,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -429,8 +428,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -486,8 +484,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -542,8 +539,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;

diff --git a/JSONCodable/JSONDecodable.swift b/JSONCodable/JSONDecodable.swift
@@ -54,12 +54,12 @@ public protocol JSONDecodable {
 
 public extension JSONDecodable {
     /// initialize with top-level Array JSON data 
-    public init(object: [JSONObject]) throws {
+    init(object: [JSONObject]) throws {
         // use empty string key
         try self.init(object:["": object])
     }
 
-    public init?(optional: JSONObject) {
+    init?(optional: JSONObject) {
         do {
             try self.init(object: optional)
         } catch {

diff --git a/JSONCodable/JSONEncodable+Mirror.swift b/JSONCodable/JSONEncodable+Mirror.swift
@@ -12,7 +12,7 @@ public extension Mirror {
      
      - returns: array of Tuples containing the label and value for each property
      */
-    public func getAllProperties() -> [(label: String?, value: Any)] {
+    func getAllProperties() -> [(label: String?, value: Any)] {
         var children: [(label: String?, value: Any)] = []
         for element in self.children {
             children.append(element)

diff --git a/JSONCodable/JSONEncodable.swift b/JSONCodable/JSONEncodable.swift
@@ -105,7 +105,7 @@ public extension JSONEncodable {
 public extension Array { //where Element: JSONEncodable {
     private var wrapped: [Any] { return self.map{$0} }
 
-    public func toJSON() throws -> Any {
+    func toJSON() throws -> Any {
         var results: [Any] = []
         for item in self.wrapped {
             if let item = item as? JSONEncodable {
@@ -122,7 +122,7 @@ public extension Array { //where Element: JSONEncodable {
 // Dictionary convenience methods
 
 public extension Dictionary {//where Key: String, Value: JSONEncodable {
-    public func toJSON() throws -> Any {
+    func toJSON() throws -> Any {
         var result: [String: Any] = [:]
         for (k, item) in self {
             if let item = item as? JSONEncodable {

diff --git a/JSONCodable/JSONString.swift b/JSONCodable/JSONString.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 public extension JSONEncodable {
-    public func toJSONString() throws -> String {
+    func toJSONString() throws -> String {
         switch self {
         case let str as String:
             return escapeJSONString(str)
@@ -45,7 +45,7 @@ private func escapeJSONString(_ str: String) -> String {
 }
 
 public extension Optional where Wrapped: JSONEncodable {
-    public func toJSONString() throws -> String {
+    func toJSONString() throws -> String {
         switch self {
         case let .some(jsonEncodable):
             return try jsonEncodable.toJSONString()

diff --git a/JSONCodableTests/EncodeNestingTests.swift b/JSONCodableTests/EncodeNestingTests.swift
@@ -28,6 +28,20 @@ class EncodeNestingTests: XCTestCase {
                 XCTFail()
                 return
         }
-        XCTAssert(String(describing:json1) == String(describing:propertyItemArray), "failed to convert to \(propertyItemArray)")
+
+        XCTAssertEqual(json1["class"] as! String, propertyItemArray["class"] as! String)
+        XCTAssertEqual(json1["class"] as! String, propertyItemArray["class"] as! String)
+
+        let properties = propertyItemArray["properties"] as! [String: Any]
+        let properties1 = json1["properties"] as! [String: Any]
+        XCTAssertEqual(properties1["name"] as! String, properties["name"] as! String)
+
+        let location = properties["location"] as! [String: Any]
+        let location1 = properties1["location"] as! [String: Any]
+
+        let coord = location["coord"] as! [String: Any]
+        let coord1 = location1["coord"] as! [String: Any]
+        XCTAssertEqual(coord["lat"] as! Double, coord1["lat"] as! Double)
+        XCTAssertEqual(coord["long"] as! Double, coord1["long"] as! Double)
     }
 }