Skip to content

Commit 4a68c3f

Browse files
committed
JSONEncoder now using JSONSerialization with reference numeric types
1 parent eac219a commit 4a68c3f

File tree

8 files changed

+149
-684
lines changed

8 files changed

+149
-684
lines changed

Foundation.xcodeproj/project.pbxproj

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
231503DB1D8AEE5D0061694D /* TestNSDecimal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 231503DA1D8AEE5D0061694D /* TestNSDecimal.swift */; };
1414
294E3C1D1CC5E19300E4F44C /* TestNSAttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294E3C1C1CC5E19300E4F44C /* TestNSAttributedString.swift */; };
1515
2EBE67A51C77BF0E006583D5 /* TestNSDateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBE67A31C77BF05006583D5 /* TestNSDateFormatter.swift */; };
16-
3E8583B31EF5B6B600174E94 /* ConsistentCasting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E8583B21EF5B6B600174E94 /* ConsistentCasting.swift */; };
17-
3E8583B41EF5BFA700174E94 /* ConsistentCasting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E8583B21EF5B6B600174E94 /* ConsistentCasting.swift */; };
18-
3EA9D66E1EF050C800B362D6 /* TestCastingUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA9D66D1EF050C800B362D6 /* TestCastingUtils.swift */; };
1916
3EA9D6701EF0532D00B362D6 /* TestJSONEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA9D66F1EF0532D00B362D6 /* TestJSONEncoder.swift */; };
2017
3EDCE50C1EF04D8100C2EC04 /* Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCE5051EF04D8100C2EC04 /* Codable.swift */; };
2118
3EDCE5101EF04D8100C2EC04 /* JSONEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */; };
@@ -488,8 +485,6 @@
488485
231503DA1D8AEE5D0061694D /* TestNSDecimal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSDecimal.swift; sourceTree = "<group>"; };
489486
294E3C1C1CC5E19300E4F44C /* TestNSAttributedString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSAttributedString.swift; sourceTree = "<group>"; };
490487
2EBE67A31C77BF05006583D5 /* TestNSDateFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSDateFormatter.swift; sourceTree = "<group>"; };
491-
3E8583B21EF5B6B600174E94 /* ConsistentCasting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsistentCasting.swift; sourceTree = "<group>"; };
492-
3EA9D66D1EF050C800B362D6 /* TestCastingUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestCastingUtils.swift; sourceTree = "<group>"; };
493488
3EA9D66F1EF0532D00B362D6 /* TestJSONEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestJSONEncoder.swift; sourceTree = "<group>"; };
494489
3EDCE5051EF04D8100C2EC04 /* Codable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Codable.swift; sourceTree = "<group>"; };
495490
3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONEncoder.swift; sourceTree = "<group>"; };
@@ -975,7 +970,6 @@
975970
children = (
976971
3EDCE5051EF04D8100C2EC04 /* Codable.swift */,
977972
3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */,
978-
3E8583B21EF5B6B600174E94 /* ConsistentCasting.swift */,
979973
);
980974
name = JSONEncoder;
981975
sourceTree = "<group>";
@@ -1417,7 +1411,6 @@
14171411
isa = PBXGroup;
14181412
children = (
14191413
3EA9D66F1EF0532D00B362D6 /* TestJSONEncoder.swift */,
1420-
3EA9D66D1EF050C800B362D6 /* TestCastingUtils.swift */,
14211414
159884911DCC877700E3314C /* TestNSHTTPCookieStorage.swift */,
14221415
D4FE895A1D703D1100DA7986 /* TestURLRequest.swift */,
14231416
C93559281C12C49F009FD6A9 /* TestNSAffineTransform.swift */,
@@ -2144,7 +2137,6 @@
21442137
EADE0B951BD15DFF00C49C64 /* NSDateComponentsFormatter.swift in Sources */,
21452138
EADE0BBD1BD15E0000C49C64 /* NSURLCredential.swift in Sources */,
21462139
EADE0BCA1BD15E0000C49C64 /* NSXMLElement.swift in Sources */,
2147-
3E8583B31EF5B6B600174E94 /* ConsistentCasting.swift in Sources */,
21482140
EADE0BA21BD15E0000C49C64 /* NSJSONSerialization.swift in Sources */,
21492141
5BF7AEBA1BCD51F9008F214A /* NSString.swift in Sources */,
21502142
5BF7AEB81BCD51F9008F214A /* NSRange.swift in Sources */,
@@ -2391,7 +2383,6 @@
23912383
5B13B3301C582D4C00651CE2 /* TestNSHTTPCookie.swift in Sources */,
23922384
5B13B3361C582D4C00651CE2 /* TestNSLocale.swift in Sources */,
23932385
5B13B3391C582D4C00651CE2 /* TestNSNull.swift in Sources */,
2394-
3EA9D66E1EF050C800B362D6 /* TestCastingUtils.swift in Sources */,
23952386
BD8042161E09857800487EB8 /* TestNSLengthFormatter.swift in Sources */,
23962387
5B13B3421C582D4C00651CE2 /* TestNSRunLoop.swift in Sources */,
23972388
5B13B34E1C582D4C00651CE2 /* TestNSXMLDocument.swift in Sources */,
@@ -2430,7 +2421,6 @@
24302421
5B13B33A1C582D4C00651CE2 /* TestNSNumber.swift in Sources */,
24312422
5B13B3521C582D4C00651CE2 /* TestNSValue.swift in Sources */,
24322423
5B13B3311C582D4C00651CE2 /* TestNSIndexPath.swift in Sources */,
2433-
3E8583B41EF5BFA700174E94 /* ConsistentCasting.swift in Sources */,
24342424
5B13B3271C582D4C00651CE2 /* TestNSArray.swift in Sources */,
24352425
5B13B3461C582D4C00651CE2 /* TestProcess.swift in Sources */,
24362426
555683BD1C1250E70041D4C6 /* TestNSUserDefaults.swift in Sources */,
@@ -2808,7 +2798,7 @@
28082798
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
28092799
LIBRARY_SEARCH_PATHS = "$(inherited)";
28102800
MACH_O_TYPE = mh_execute;
2811-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3 -DTEST_TARGET";
2801+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3";
28122802
PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation;
28132803
PRODUCT_NAME = "$(TARGET_NAME)";
28142804
SKIP_INSTALL = YES;
@@ -2834,7 +2824,7 @@
28342824
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
28352825
LIBRARY_SEARCH_PATHS = "$(inherited)";
28362826
MACH_O_TYPE = mh_execute;
2837-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3 -DTEST_TARGET";
2827+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3";
28382828
PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation;
28392829
PRODUCT_NAME = "$(TARGET_NAME)";
28402830
SKIP_INSTALL = YES;

Foundation/ConsistentCasting.swift

Lines changed: 0 additions & 272 deletions
This file was deleted.

0 commit comments

Comments
 (0)