Revert "Fix wrong ObjC type mapping (#65)"

This reverts commit 1c7bb78, due to #67.

Author: minacle

Sources/AnyCodable/AnyEncodable.swift

@@ -109,21 +109,21 @@ extension _AnyEncodable {
     #if canImport(Foundation)
     private func encode(nsnumber: NSNumber, into container: inout SingleValueEncodingContainer) throws {
         switch Character(Unicode.Scalar(UInt8(nsnumber.objCType.pointee)))  {
-        case "B":
+        case "c", "C":
             try container.encode(nsnumber.boolValue)
-        case "c":
-            try container.encode(nsnumber.int8Value)
         case "s":
+            try container.encode(nsnumber.int8Value)
+        case "i":
             try container.encode(nsnumber.int16Value)
-        case "i", "l":
+        case "l":
             try container.encode(nsnumber.int32Value)
         case "q":
             try container.encode(nsnumber.int64Value)
-        case "C":
-            try container.encode(nsnumber.uint8Value)
         case "S":
+            try container.encode(nsnumber.uint8Value)
+        case "I":
             try container.encode(nsnumber.uint16Value)
-        case "I", "L":
+        case "L":
             try container.encode(nsnumber.uint32Value)
         case "Q":
             try container.encode(nsnumber.uint64Value)

Tests/AnyCodableTests/AnyCodableTests.swift

@@ -74,7 +74,7 @@ class AnyCodableTests: XCTestCase {
 
         let expected = """
         {
-            "boolean": 1,
+            "boolean": true,
             "integer": 42,
             "double": 3.141592653589793,
             "string": "string",

Tests/AnyCodableTests/AnyEncodableTests.swift

@@ -43,7 +43,7 @@ class AnyEncodableTests: XCTestCase {
 
         let expected = """
         {
-            "boolean": 1,
+            "boolean": true,
             "integer": 42,
             "double": 3.141592653589793,
             "string": "string",
@@ -70,16 +70,7 @@ class AnyEncodableTests: XCTestCase {
     func testEncodeNSNumber() throws {
         let dictionary: [String: NSNumber] = [
             "boolean": true,
-            "char": -127,
-            "int": -32767,
-            "short": -32767,
-            "long": -2147483647,
-            "longlong": -9223372036854775807,
-            "uchar": 255,
-            "uint": 65535,
-            "ushort": 65535,
-            "ulong": 4294967295,
-            "ulonglong": 18446744073709615,
+            "integer": 42,
             "double": 3.141592653589793,
         ]
 
@@ -90,37 +81,16 @@ class AnyEncodableTests: XCTestCase {
 
         let expected = """
         {
-            "boolean": 1,
-            "char": -127,
-            "int": -32767,
-            "short": -32767,
-            "long": -2147483647,
-            "longlong": -9223372036854775807,
-            "uchar": 255,
-            "uint": 65535,
-            "ushort": 65535,
-            "ulong": 4294967295,
-            "ulonglong": 18446744073709615,
+            "boolean": true,
+            "integer": 42,
             "double": 3.141592653589793,
         }
         """.data(using: .utf8)!
         let expectedJSONObject = try JSONSerialization.jsonObject(with: expected, options: []) as! NSDictionary
 
         XCTAssertEqual(encodedJSONObject, expectedJSONObject)
         XCTAssert(encodedJSONObject["boolean"] is Bool)
-
-        XCTAssert(encodedJSONObject["char"] is Int8)
-        XCTAssert(encodedJSONObject["int"] is Int16)
-        XCTAssert(encodedJSONObject["short"] is Int32)
-        XCTAssert(encodedJSONObject["long"] is Int32)
-        XCTAssert(encodedJSONObject["longlong"] is Int64)
-
-        XCTAssert(encodedJSONObject["uchar"] is UInt8)
-        XCTAssert(encodedJSONObject["uint"] is UInt16)
-        XCTAssert(encodedJSONObject["ushort"] is UInt32)
-        XCTAssert(encodedJSONObject["ulong"] is UInt32)
-        XCTAssert(encodedJSONObject["ulonglong"] is UInt64)
-
+        XCTAssert(encodedJSONObject["integer"] is Int)
         XCTAssert(encodedJSONObject["double"] is Double)
     }