Skip to content

Commit a4807da

Browse files
committed
Split out some types from NSURL.swift
- class NSURLComponents => NSURLComponents.swift - class NSURLQueryItem => NSURLQueryItem.swift - struct URLResourceKey, URLFileResourceType => URLResourceKey.swift
1 parent 09587ca commit a4807da

File tree

6 files changed

+582
-535
lines changed

6 files changed

+582
-535
lines changed

Foundation.xcodeproj/project.pbxproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,9 @@
403403
B94B063C23FDE2BD00B244E8 /* SwiftFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B5D885D1BBC938800234F36 /* SwiftFoundation.framework */; };
404404
B951B5EC1F4E2A2000D8B332 /* TestNSLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B951B5EB1F4E2A2000D8B332 /* TestNSLock.swift */; };
405405
B95FC97622B84B0A005DEA0A /* TestNSSortDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 152EF3932283457B001E1269 /* TestNSSortDescriptor.swift */; };
406+
B96C10F625BA1EFD00985A32 /* NSURLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96C10F525BA1EFD00985A32 /* NSURLComponents.swift */; };
407+
B96C110025BA20A600985A32 /* NSURLQueryItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96C10FF25BA20A600985A32 /* NSURLQueryItem.swift */; };
408+
B96C110A25BA215800985A32 /* URLResourceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96C110925BA215800985A32 /* URLResourceKey.swift */; };
406409
B983E32C23F0C69600D9C402 /* Docs in Resources */ = {isa = PBXBuildFile; fileRef = B983E32B23F0C69600D9C402 /* Docs */; };
407410
B983E32E23F0C6E200D9C402 /* CONTRIBUTING.md in Resources */ = {isa = PBXBuildFile; fileRef = B983E32D23F0C6E200D9C402 /* CONTRIBUTING.md */; };
408411
B98E33DD2136AA740044EBE9 /* TestFileWithZeros.txt in Resources */ = {isa = PBXBuildFile; fileRef = B98E33DC2136AA740044EBE9 /* TestFileWithZeros.txt */; };
@@ -1108,6 +1111,9 @@
11081111
B951B5EB1F4E2A2000D8B332 /* TestNSLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestNSLock.swift; sourceTree = "<group>"; };
11091112
B95FC97222AF0050005DEA0A /* SwiftXCTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SwiftXCTest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
11101113
B95FC97422AF051B005DEA0A /* xcode-build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "xcode-build.sh"; sourceTree = "<group>"; };
1114+
B96C10F525BA1EFD00985A32 /* NSURLComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSURLComponents.swift; sourceTree = "<group>"; };
1115+
B96C10FF25BA20A600985A32 /* NSURLQueryItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSURLQueryItem.swift; sourceTree = "<group>"; };
1116+
B96C110925BA215800985A32 /* URLResourceKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLResourceKey.swift; sourceTree = "<group>"; };
11111117
B983E32B23F0C69600D9C402 /* Docs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Docs; sourceTree = "<group>"; };
11121118
B983E32D23F0C6E200D9C402 /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
11131119
B98E33DC2136AA740044EBE9 /* TestFileWithZeros.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestFileWithZeros.txt; sourceTree = "<group>"; };
@@ -2133,6 +2139,8 @@
21332139
EADE0B7B1BD15DFF00C49C64 /* NSTextCheckingResult.swift */,
21342140
5BDC3F491BCC5DCB00ED97BB /* NSTimeZone.swift */,
21352141
5BDC3F4A1BCC5DCB00ED97BB /* NSURL.swift */,
2142+
B96C10F525BA1EFD00985A32 /* NSURLComponents.swift */,
2143+
B96C10FF25BA20A600985A32 /* NSURLQueryItem.swift */,
21362144
EADE0B811BD15DFF00C49C64 /* NSURLError.swift */,
21372145
5BDC3F4B1BCC5DCB00ED97BB /* NSUUID.swift */,
21382146
5BDC3F4C1BCC5DCB00ED97BB /* NSValue.swift */,
@@ -2163,6 +2171,7 @@
21632171
5BECBA3B1D1CAF8800B39B1F /* Unit.swift */,
21642172
5B23AB8C1CE63228000DB898 /* URL.swift */,
21652173
5BCCA8D81CE6697F0059B963 /* URLComponents.swift */,
2174+
B96C110925BA215800985A32 /* URLResourceKey.swift */,
21662175
EADE0B871BD15DFF00C49C64 /* UserDefaults.swift */,
21672176
6EB768271D18C12C00D4B719 /* UUID.swift */,
21682177
);
@@ -2857,6 +2866,7 @@
28572866
5BF7AEBE1BCD51F9008F214A /* NSTimeZone.swift in Sources */,
28582867
EADE0B951BD15DFF00C49C64 /* DateComponentsFormatter.swift in Sources */,
28592868
5BC1B9AE21F275E900524D8C /* Pointers+DataProtocol.swift in Sources */,
2869+
B96C10F625BA1EFD00985A32 /* NSURLComponents.swift in Sources */,
28602870
EADE0BA21BD15E0000C49C64 /* JSONSerialization.swift in Sources */,
28612871
5BF7AEBA1BCD51F9008F214A /* NSString.swift in Sources */,
28622872
5BF7AEB81BCD51F9008F214A /* NSRange.swift in Sources */,
@@ -2935,12 +2945,14 @@
29352945
D3BCEBA01C2F6DDB00295652 /* NSKeyedCoderOldStyleArray.swift in Sources */,
29362946
5B8BA1621D0B773A00938C27 /* IndexSet.swift in Sources */,
29372947
EADE0BA71BD15E0000C49C64 /* NSNotification.swift in Sources */,
2948+
B96C110A25BA215800985A32 /* URLResourceKey.swift in Sources */,
29382949
5BF7AEB41BCD51F9008F214A /* NSObject.swift in Sources */,
29392950
EADE0B521BD09F2F00C49C64 /* ByteCountFormatter.swift in Sources */,
29402951
5BA0106E1DF212B300E56898 /* NSPlatform.swift in Sources */,
29412952
D3BCEB9E1C2EDED800295652 /* NSLog.swift in Sources */,
29422953
15CA750A24F8336A007DF6C1 /* NSCFTypeShims.swift in Sources */,
29432954
61E0117D1C1B5590000037DD /* RunLoop.swift in Sources */,
2955+
B96C110025BA20A600985A32 /* NSURLQueryItem.swift in Sources */,
29442956
5B23AB8B1CE62F9B000DB898 /* PersonNameComponents.swift in Sources */,
29452957
EADE0BA61BD15E0000C49C64 /* MassFormatter.swift in Sources */,
29462958
5BECBA3A1D1CAE9A00B39B1F /* NSMeasurement.swift in Sources */,

Sources/Foundation/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ add_library(Foundation
100100
NSTextCheckingResult.swift
101101
NSTimeZone.swift
102102
NSURL.swift
103+
NSURLComponents.swift
104+
NSURLQueryItem.swift
103105
NSURLError.swift
104106
NSUUID.swift
105107
NSValue.swift
@@ -130,6 +132,7 @@ add_library(Foundation
130132
Unit.swift
131133
URL.swift
132134
URLComponents.swift
135+
URLResourceKey.swift
133136
UserDefaults.swift
134137
UUID.swift)
135138
target_compile_definitions(Foundation PRIVATE

0 commit comments

Comments
 (0)