Skip to content

Commit d2d72f8

Browse files
pvieitoparkera
authored andcommitted
Added PropertyListEncoder/Decoder from Darwin SDK Overlay (swiftlang#1849)
* Added PropertyListEncoder/Decoder from Darwin SDK Overlay * Added Date and Data to the tests
1 parent d1510fd commit d2d72f8

File tree

5 files changed

+1993
-3
lines changed

5 files changed

+1993
-3
lines changed

CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ add_swift_library(Foundation
235235
Foundation/ProcessInfo.swift
236236
Foundation/Progress.swift
237237
Foundation/ProgressFraction.swift
238+
Foundation/PropertyListEncoder.swift
238239
Foundation/PropertyListSerialization.swift
239240
Foundation/ReferenceConvertible.swift
240241
Foundation/RunLoop.swift
@@ -395,6 +396,7 @@ if(ENABLE_TESTING)
395396
TestFoundation/TestIndexSet.swift
396397
TestFoundation/TestISO8601DateFormatter.swift
397398
TestFoundation/TestJSONEncoder.swift
399+
TestFoundation/TestPropertyListEncoder.swift
398400
TestFoundation/TestJSONSerialization.swift
399401
TestFoundation/TestLengthFormatter.swift
400402
TestFoundation/TestMassFormatter.swift

Foundation.xcodeproj/project.pbxproj

+11-3
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@
352352
9F0DD3521ECD73D000F68030 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0041781ECD5962004138BD /* main.swift */; };
353353
9F0DD3571ECD783500F68030 /* SwiftFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B5D885D1BBC938800234F36 /* SwiftFoundation.framework */; };
354354
A058C2021E529CF100B07AA1 /* TestMassFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A058C2011E529CF100B07AA1 /* TestMassFormatter.swift */; };
355+
AA9E0E0B21FA6C5600963F4C /* PropertyListEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9E0E0A21FA6C5600963F4C /* PropertyListEncoder.swift */; };
356+
AA9E0E0D21FA6E0700963F4C /* TestPropertyListEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9E0E0C21FA6E0700963F4C /* TestPropertyListEncoder.swift */; };
355357
AE35A1861CBAC85E0042DB84 /* SwiftFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = AE35A1851CBAC85E0042DB84 /* SwiftFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
356358
B907F36B20BB07A700013CBE /* NSString-ISO-8859-1-data.txt in Resources */ = {isa = PBXBuildFile; fileRef = B907F36A20BB07A700013CBE /* NSString-ISO-8859-1-data.txt */; };
357359
B90C57BB1EEEEA5A005208AE /* TestFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 525AECEB1BF2C96400D15BB0 /* TestFileManager.swift */; };
@@ -877,6 +879,8 @@
877879
9F4ADBB61ECD445E001F0B3D /* SymbolAliases */ = {isa = PBXFileReference; lastKnownFileType = text; path = SymbolAliases; sourceTree = "<group>"; };
878880
A058C2011E529CF100B07AA1 /* TestMassFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestMassFormatter.swift; sourceTree = "<group>"; };
879881
A5A34B551C18C85D00FD972B /* TestByteCountFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestByteCountFormatter.swift; sourceTree = "<group>"; };
882+
AA9E0E0A21FA6C5600963F4C /* PropertyListEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PropertyListEncoder.swift; sourceTree = "<group>"; };
883+
AA9E0E0C21FA6E0700963F4C /* TestPropertyListEncoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestPropertyListEncoder.swift; sourceTree = "<group>"; };
880884
AE35A1851CBAC85E0042DB84 /* SwiftFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SwiftFoundation.h; sourceTree = "<group>"; };
881885
B167A6641ED7303F0040B09A /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
882886
B907F36A20BB07A700013CBE /* NSString-ISO-8859-1-data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "NSString-ISO-8859-1-data.txt"; sourceTree = "<group>"; };
@@ -1074,13 +1078,14 @@
10741078
/* End PBXFrameworksBuildPhase section */
10751079

10761080
/* Begin PBXGroup section */
1077-
3EDCE5121EF04D8600C2EC04 /* JSONEncoder */ = {
1081+
3EDCE5121EF04D8600C2EC04 /* Codable */ = {
10781082
isa = PBXGroup;
10791083
children = (
10801084
3EDCE5051EF04D8100C2EC04 /* Codable.swift */,
10811085
3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */,
1086+
AA9E0E0A21FA6C5600963F4C /* PropertyListEncoder.swift */,
10821087
);
1083-
name = JSONEncoder;
1088+
name = Codable;
10841089
sourceTree = "<group>";
10851090
};
10861091
5B1FD9C71D6D162D0080E83C /* Session */ = {
@@ -1570,6 +1575,7 @@
15701575
A058C2011E529CF100B07AA1 /* TestMassFormatter.swift */,
15711576
BF8E65301DC3B3CB005AB5C3 /* TestNotification.swift */,
15721577
3EA9D66F1EF0532D00B362D6 /* TestJSONEncoder.swift */,
1578+
AA9E0E0C21FA6E0700963F4C /* TestPropertyListEncoder.swift */,
15731579
DCA8120A1F046D13000D0C86 /* TestCodable.swift */,
15741580
C93559281C12C49F009FD6A9 /* TestAffineTransform.swift */,
15751581
EA66F63C1BF1619600136161 /* TestNSArray.swift */,
@@ -1766,7 +1772,7 @@
17661772
EAB57B6C1BD1A852004AC5C5 /* Serialization */ = {
17671773
isa = PBXGroup;
17681774
children = (
1769-
3EDCE5121EF04D8600C2EC04 /* JSONEncoder */,
1775+
3EDCE5121EF04D8600C2EC04 /* Codable */,
17701776
EADE0B641BD15DFF00C49C64 /* JSONSerialization.swift */,
17711777
EADE0B651BD15DFF00C49C64 /* NSKeyedArchiver.swift */,
17721778
D3BCEB9F1C2F6DDB00295652 /* NSKeyedCoderOldStyleArray.swift */,
@@ -2371,6 +2377,7 @@
23712377
5BF7AEAE1BCD51F9008F214A /* Formatter.swift in Sources */,
23722378
EADE0B9C1BD15DFF00C49C64 /* FileManager.swift in Sources */,
23732379
5BF7AEA61BCD51F9008F214A /* NSCharacterSet.swift in Sources */,
2380+
AA9E0E0B21FA6C5600963F4C /* PropertyListEncoder.swift in Sources */,
23742381
5BD70FB41D3D4F8B003B9BF8 /* Calendar.swift in Sources */,
23752382
5BA9BEBD1CF4F3B8009DBD6C /* Notification.swift in Sources */,
23762383
5BD70FB21D3D4CDC003B9BF8 /* Locale.swift in Sources */,
@@ -2612,6 +2619,7 @@
26122619
5B13B34E1C582D4C00651CE2 /* TestXMLDocument.swift in Sources */,
26132620
5B13B32B1C582D4C00651CE2 /* TestNSData.swift in Sources */,
26142621
5B13B34C1C582D4C00651CE2 /* TestURLResponse.swift in Sources */,
2622+
AA9E0E0D21FA6E0700963F4C /* TestPropertyListEncoder.swift in Sources */,
26152623
0383A1751D2E558A0052E5D1 /* TestStream.swift in Sources */,
26162624
5B13B3481C582D4C00651CE2 /* TestTimer.swift in Sources */,
26172625
5B13B32D1C582D4C00651CE2 /* TestNSDictionary.swift in Sources */,

0 commit comments

Comments
 (0)