Skip to content

Commit df79904

Browse files
authored
Merge pull request #2463 from millenomi/port
Parity: Port, PortMessage and SocketPort
2 parents 84d6a68 + 340f7ea commit df79904

File tree

8 files changed

+1120
-61
lines changed

8 files changed

+1120
-61
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ if(ENABLE_TESTING)
530530
TestFoundation/TestPropertyListSerialization.swift
531531
TestFoundation/TestRunLoop.swift
532532
TestFoundation/TestScanner.swift
533+
TestFoundation/TestSocketPort.swift
533534
TestFoundation/TestStream.swift
534535
TestFoundation/TestThread.swift
535536
TestFoundation/TestTimer.swift

Foundation.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
15B80442228F38E400B30FF6 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1FD9C81D6D16580080E83C /* Configuration.swift */; };
8989
15B80443228F38E400B30FF6 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6105D30E1FEBC5FC0022865A /* Message.swift */; };
9090
15F10CDC218909BF00D88114 /* TestNSCalendar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15F10CDB218909BF00D88114 /* TestNSCalendar.swift */; };
91+
15FCF4E323021C020095E52E /* TestSocketPort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15FCF4E223021C020095E52E /* TestSocketPort.swift */; };
9192
15FF004B229348F2004AD205 /* CFURLSessionInterface.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B1FD9C11D6D160F0080E83C /* CFURLSessionInterface.c */; };
9293
15FF00CB22934A3C004AD205 /* CFURLSessionInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B1FD9C21D6D160F0080E83C /* CFURLSessionInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
9394
15FF00CC22934AD7004AD205 /* libCFURLSessionInterface.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15FF00CA229348F2004AD205 /* libCFURLSessionInterface.a */; };
@@ -728,6 +729,7 @@
728729
159884911DCC877700E3314C /* TestHTTPCookieStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHTTPCookieStorage.swift; sourceTree = "<group>"; };
729730
15B8043A228F376000B30FF6 /* SwiftFoundationNetworking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftFoundationNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
730731
15F10CDB218909BF00D88114 /* TestNSCalendar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestNSCalendar.swift; sourceTree = "<group>"; };
732+
15FCF4E223021C020095E52E /* TestSocketPort.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSocketPort.swift; sourceTree = "<group>"; };
731733
15FF00CA229348F2004AD205 /* libCFURLSessionInterface.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCFURLSessionInterface.a; sourceTree = BUILT_PRODUCTS_DIR; };
732734
15FF00CD22934B49004AD205 /* module.map */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.map; path = CoreFoundation/URL.subproj/module.map; sourceTree = SOURCE_ROOT; };
733735
22B9C1E01C165D7A00DECFF9 /* TestDate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestDate.swift; sourceTree = "<group>"; };
@@ -1858,6 +1860,7 @@
18581860
61E0117B1C1B554D000037DD /* TestRunLoop.swift */,
18591861
844DC3321C17584F005611F9 /* TestScanner.swift */,
18601862
EA66F6411BF1619600136161 /* TestNSSet.swift */,
1863+
15FCF4E223021C020095E52E /* TestSocketPort.swift */,
18611864
0383A1741D2E558A0052E5D1 /* TestStream.swift */,
18621865
EA66F6421BF1619600136161 /* TestNSString.swift */,
18631866
5FE52C941D147D1C00F7D270 /* TestNSTextCheckingResult.swift */,
@@ -3008,6 +3011,7 @@
30083011
B90C57BC1EEEEA5A005208AE /* TestThread.swift in Sources */,
30093012
B90C57BB1EEEEA5A005208AE /* TestFileManager.swift in Sources */,
30103013
A058C2021E529CF100B07AA1 /* TestMassFormatter.swift in Sources */,
3014+
15FCF4E323021C020095E52E /* TestSocketPort.swift in Sources */,
30113015
5B13B3381C582D4C00651CE2 /* TestNotificationQueue.swift in Sources */,
30123016
CC5249C01D341D23007CB54D /* TestUnitConverter.swift in Sources */,
30133017
5B13B3331C582D4C00651CE2 /* TestJSONSerialization.swift in Sources */,

Foundation/NSObjCRuntime.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ internal let _NSClassesRenamedByObjCAPINotesInNetworkingOrXML: [(swiftName: Stri
264264
internal let _NSClassesRenamedByObjCAPINotes: [(class: AnyClass, objCName: String)] = {
265265
var map: [(AnyClass, String)] = [
266266
(ProcessInfo.self, "NSProcessInfo"),
267-
(MessagePort.self, "NSMessagePort"),
268267
(Port.self, "NSPort"),
269268
(PortMessage.self, "NSPortMessage"),
270269
(SocketPort.self, "NSSocketPort"),

0 commit comments

Comments
 (0)