Skip to content

Commit 06e86e7

Browse files
authored
Merge pull request #2988 from spevans/pr_split_out_jsondecoder
Split out JSONDecoder into its own file.
2 parents 99d6439 + 885a032 commit 06e86e7

File tree

4 files changed

+1037
-1015
lines changed

4 files changed

+1037
-1015
lines changed

Foundation.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,8 @@
409409
B96C110A25BA215800985A32 /* URLResourceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96C110925BA215800985A32 /* URLResourceKey.swift */; };
410410
B96C112525BA2CE700985A32 /* URLQueryItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96C112425BA2CE700985A32 /* URLQueryItem.swift */; };
411411
B96C113725BA376D00985A32 /* NSDateComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96C113625BA376D00985A32 /* NSDateComponents.swift */; };
412+
B98303EA25F2131D001F959E /* JSONDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B98303E925F2131D001F959E /* JSONDecoder.swift */; };
413+
B98303F425F21389001F959E /* CMakeLists.txt in Resources */ = {isa = PBXBuildFile; fileRef = B98303F325F21389001F959E /* CMakeLists.txt */; };
412414
B983E32C23F0C69600D9C402 /* Docs in Resources */ = {isa = PBXBuildFile; fileRef = B983E32B23F0C69600D9C402 /* Docs */; };
413415
B983E32E23F0C6E200D9C402 /* CONTRIBUTING.md in Resources */ = {isa = PBXBuildFile; fileRef = B983E32D23F0C6E200D9C402 /* CONTRIBUTING.md */; };
414416
B98E33DD2136AA740044EBE9 /* TestFileWithZeros.txt in Resources */ = {isa = PBXBuildFile; fileRef = B98E33DC2136AA740044EBE9 /* TestFileWithZeros.txt */; };
@@ -1120,6 +1122,8 @@
11201122
B96C110925BA215800985A32 /* URLResourceKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLResourceKey.swift; sourceTree = "<group>"; };
11211123
B96C112425BA2CE700985A32 /* URLQueryItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLQueryItem.swift; sourceTree = "<group>"; };
11221124
B96C113625BA376D00985A32 /* NSDateComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSDateComponents.swift; sourceTree = "<group>"; };
1125+
B98303E925F2131D001F959E /* JSONDecoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONDecoder.swift; sourceTree = "<group>"; };
1126+
B98303F325F21389001F959E /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
11231127
B983E32B23F0C69600D9C402 /* Docs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Docs; sourceTree = "<group>"; };
11241128
B983E32D23F0C6E200D9C402 /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
11251129
B98E33DC2136AA740044EBE9 /* TestFileWithZeros.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestFileWithZeros.txt; sourceTree = "<group>"; };
@@ -2042,6 +2046,7 @@
20422046
F023072323F0A6E50023DBEC /* Foundation */ = {
20432047
isa = PBXGroup;
20442048
children = (
2049+
B98303F325F21389001F959E /* CMakeLists.txt */,
20452050
F023072523F0B4890023DBEC /* Headers */,
20462051
F023072423F0B4140023DBEC /* Resources */,
20472052
EADE0B4D1BD09E0800C49C64 /* AffineTransform.swift */,
@@ -2080,6 +2085,7 @@
20802085
5B424C751D0B6E5B007B39C8 /* IndexPath.swift */,
20812086
5B8BA1611D0B773A00938C27 /* IndexSet.swift */,
20822087
63DCE9D11EAA430100E9CB02 /* ISO8601DateFormatter.swift */,
2088+
B98303E925F2131D001F959E /* JSONDecoder.swift */,
20832089
3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */,
20842090
EADE0B641BD15DFF00C49C64 /* JSONSerialization.swift */,
20852091
49D55FA025E84FE5007BD3B3 /* JSONSerialization+Parser.swift */,
@@ -2713,6 +2719,7 @@
27132719
isa = PBXResourcesBuildPhase;
27142720
buildActionMask = 2147483647;
27152721
files = (
2722+
B98303F425F21389001F959E /* CMakeLists.txt in Resources */,
27162723
F023072623F0B4890023DBEC /* Headers in Resources */,
27172724
B983E32C23F0C69600D9C402 /* Docs in Resources */,
27182725
B983E32E23F0C6E200D9C402 /* CONTRIBUTING.md in Resources */,
@@ -2979,6 +2986,7 @@
29792986
5BF7AEB11BCD51F9008F214A /* NSLock.swift in Sources */,
29802987
5BF7AEB91BCD51F9008F214A /* NSSet.swift in Sources */,
29812988
5BCCA8D91CE6697F0059B963 /* URLComponents.swift in Sources */,
2989+
B98303EA25F2131D001F959E /* JSONDecoder.swift in Sources */,
29822990
5BDC3FCC1BCF177E00ED97BB /* NSCFString.swift in Sources */,
29832991
EADE0BAC1BD15E0000C49C64 /* NSOrderedSet.swift in Sources */,
29842992
5BC1B9A421F2757F00524D8C /* ContiguousBytes.swift in Sources */,

Sources/Foundation/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ add_library(Foundation
3535
IndexPath.swift
3636
IndexSet.swift
3737
ISO8601DateFormatter.swift
38+
JSONDecoder.swift
3839
JSONEncoder.swift
3940
JSONSerialization.swift
4041
JSONSerialization+Parser.swift

0 commit comments

Comments
 (0)