Remove deprecated API in 4.2.0

wongzigii · wongzigii · commit 184c6884998c · 2018-09-26T00:20:01.000+08:00
diff --git a/Source/SwiftyJSON.swift b/Source/SwiftyJSON.swift
@@ -24,22 +24,6 @@ import Foundation
 
 // MARK: - Error
 // swiftlint:disable line_length
-/// Error domain
-@available(*, deprecated, message: "ErrorDomain is deprecated. Use `SwiftyJSONError.errorDomain` instead.", renamed: "SwiftyJSONError.errorDomain")
-public let ErrorDomain: String = "SwiftyJSONErrorDomain"
-
-/// Error code
-@available(*, deprecated, message: "ErrorUnsupportedType is deprecated. Use `SwiftyJSONError.unsupportedType` instead.", renamed: "SwiftyJSONError.unsupportedType")
-public let ErrorUnsupportedType: Int = 999
-@available(*, deprecated, message: "ErrorIndexOutOfBounds is deprecated. Use `SwiftyJSONError.indexOutOfBounds` instead.", renamed: "SwiftyJSONError.indexOutOfBounds")
-public let ErrorIndexOutOfBounds: Int = 900
-@available(*, deprecated, message: "ErrorWrongType is deprecated. Use `SwiftyJSONError.wrongType` instead.", renamed: "SwiftyJSONError.wrongType")
-public let ErrorWrongType: Int = 901
-@available(*, deprecated, message: "ErrorNotExist is deprecated. Use `SwiftyJSONError.notExist` instead.", renamed: "SwiftyJSONError.notExist")
-public let ErrorNotExist: Int = 500
-@available(*, deprecated, message: "ErrorInvalidJSON is deprecated. Use `SwiftyJSONError.invalidJSON` instead.", renamed: "SwiftyJSONError.invalidJSON")
-public let ErrorInvalidJSON: Int = 490
-
 public enum SwiftyJSONError: Int, Swift.Error {
     case unsupportedType = 999
     case indexOutOfBounds = 900
@@ -146,19 +130,6 @@ public struct JSON {
 		}
 	}
 
-	/**
-	 Creates a JSON from JSON string
-	
-	 - parameter json: Normal json string like '{"a":"b"}'
-	
-	 - returns: The created JSON
-	 */
-    @available(*, deprecated, message: "Use instead `init(parseJSON: )`")
-    public static func parse(_ json: String) -> JSON {
-        return json.data(using: String.Encoding.utf8)
-            .flatMap { try? JSON(data: $0) } ?? JSON(NSNull())
-    }
-
 	/**
 	 Creates a JSON using the object.
 	
@@ -592,14 +563,6 @@ extension JSON: Swift.ExpressibleByArrayLiteral {
     }
 }
 
-extension JSON: Swift.ExpressibleByNilLiteral {
-
-    @available(*, deprecated, message: "use JSON.null instead. Will be removed in future versions")
-    public init(nilLiteral: ()) {
-        self.init(NSNull() as Any)
-    }
-}
-
 // MARK: - Raw
 
 extension JSON: Swift.RawRepresentable {
diff --git a/Tests/SwiftyJSONTests/PerformanceTests.swift b/Tests/SwiftyJSONTests/PerformanceTests.swift
@@ -127,7 +127,7 @@ class PerformanceTests: XCTestCase {
         self.measure {
             autoreleasepool {
                 if let dictionary = json.dictionary {
-                    XCTAssertTrue(dictionary.count > 0)
+                    XCTAssertTrue(dictionary.count == 100001)
                 } else {
                     XCTFail("dictionary should not be nil")
                 }

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ class PerformanceTests: XCTestCase {`
`127`	`127`	`self.measure {`
`128`	`128`	`autoreleasepool {`
`129`	`129`	`if let dictionary = json.dictionary {`
`130`		`- XCTAssertTrue(dictionary.count > 0)`
	`130`	`+ XCTAssertTrue(dictionary.count == 100001)`
`131`	`131`	`} else {`
`132`	`132`	`XCTFail("dictionary should not be nil")`
`133`	`133`	`}`