Skip to content

Added libcurl abstractions to libcurl directory #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swift-ci merged 1 commit into from
Nov 22, 2017
Merged

Added libcurl abstractions to libcurl directory #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions Foundation.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,12 +798,12 @@
B933A79D1F3055F600FE6846 /* NSString-UTF32-LE-data.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "NSString-UTF32-LE-data.txt"; sourceTree = "<group>"; };
B951B5EB1F4E2A2000D8B332 /* TestNSLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestNSLock.swift; sourceTree = "<group>"; };
B9974B8F1EDF4A22007F15B8 /* TransferState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TransferState.swift; path = http/TransferState.swift; sourceTree = "<group>"; };
B9974B901EDF4A22007F15B8 /* MultiHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MultiHandle.swift; path = http/MultiHandle.swift; sourceTree = "<group>"; };
B9974B911EDF4A22007F15B8 /* libcurlHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = libcurlHelpers.swift; path = http/libcurlHelpers.swift; sourceTree = "<group>"; };
B9974B901EDF4A22007F15B8 /* MultiHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultiHandle.swift; sourceTree = "<group>"; };
B9974B911EDF4A22007F15B8 /* libcurlHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = libcurlHelpers.swift; sourceTree = "<group>"; };
B9974B921EDF4A22007F15B8 /* HTTPURLProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPURLProtocol.swift; path = http/HTTPURLProtocol.swift; sourceTree = "<group>"; };
B9974B931EDF4A22007F15B8 /* HTTPMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPMessage.swift; path = http/HTTPMessage.swift; sourceTree = "<group>"; };
B9974B941EDF4A22007F15B8 /* HTTPBodySource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPBodySource.swift; path = http/HTTPBodySource.swift; sourceTree = "<group>"; };
B9974B951EDF4A22007F15B8 /* EasyHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EasyHandle.swift; path = http/EasyHandle.swift; sourceTree = "<group>"; };
B9974B951EDF4A22007F15B8 /* EasyHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EasyHandle.swift; sourceTree = "<group>"; };
BD8042151E09857800487EB8 /* TestLengthFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestLengthFormatter.swift; sourceTree = "<group>"; };
BDBB658F1E256BFA001A7286 /* TestEnergyFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEnergyFormatter.swift; sourceTree = "<group>"; };
BDFDF0A61DFF5B3E00C04CC5 /* TestPersonNameComponents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestPersonNameComponents.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -993,6 +993,7 @@
5B1FD9C71D6D162D0080E83C /* Session */ = {
isa = PBXGroup;
children = (
614732781FC2DEB7005B5E61 /* libcurl */,
E4F889331E9CF04D008A70EB /* http */,
5B1FD9C81D6D16580080E83C /* Configuration.swift */,
5B1FD9CE1D6D16580080E83C /* URLSession.swift */,
Expand Down Expand Up @@ -1352,6 +1353,16 @@
path = Foundation;
sourceTree = "<group>";
};
614732781FC2DEB7005B5E61 /* libcurl */ = {
isa = PBXGroup;
children = (
B9974B901EDF4A22007F15B8 /* MultiHandle.swift */,
B9974B911EDF4A22007F15B8 /* libcurlHelpers.swift */,
B9974B951EDF4A22007F15B8 /* EasyHandle.swift */,
);
path = libcurl;
sourceTree = "<group>";
};
9F4ADBCF1ECD4F56001F0B3D /* xdgTestHelper */ = {
isa = PBXGroup;
children = (
Expand All @@ -1367,11 +1378,8 @@
children = (
B9974B921EDF4A22007F15B8 /* HTTPURLProtocol.swift */,
B9974B8F1EDF4A22007F15B8 /* TransferState.swift */,
B9974B901EDF4A22007F15B8 /* MultiHandle.swift */,
B9974B911EDF4A22007F15B8 /* libcurlHelpers.swift */,
B9974B931EDF4A22007F15B8 /* HTTPMessage.swift */,
B9974B941EDF4A22007F15B8 /* HTTPBodySource.swift */,
B9974B951EDF4A22007F15B8 /* EasyHandle.swift */,
);
name = http;
sourceTree = "<group>";
Expand Down Expand Up @@ -3002,3 +3010,4 @@
};
rootObject = 5B5D88541BBC938800234F36 /* Project object */;
}

0 Foundation/URLSession/http/EasyHandle.swift → ...ation/URLSession/libcurl/EasyHandle.swift
View file
Open in desktop
File renamed without changes.
0 Foundation/URLSession/http/MultiHandle.swift → ...tion/URLSession/libcurl/MultiHandle.swift
View file
Open in desktop
File renamed without changes.
0 ...tion/URLSession/http/libcurlHelpers.swift → ...n/URLSession/libcurl/libcurlHelpers.swift
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,17 +424,17 @@
'Foundation/NSURLRequest.swift',
'Foundation/URLResponse.swift',
'Foundation/URLSession/Configuration.swift',
'Foundation/URLSession/http/EasyHandle.swift',
'Foundation/URLSession/libcurl/EasyHandle.swift',
'Foundation/URLSession/http/HTTPBodySource.swift',
'Foundation/URLSession/http/HTTPMessage.swift',
'Foundation/URLSession/http/MultiHandle.swift',
'Foundation/URLSession/libcurl/MultiHandle.swift',
'Foundation/URLSession/URLSession.swift',
'Foundation/URLSession/URLSessionConfiguration.swift',
'Foundation/URLSession/URLSessionDelegate.swift',
'Foundation/URLSession/URLSessionTask.swift',
'Foundation/URLSession/TaskRegistry.swift',
'Foundation/URLSession/http/TransferState.swift',
'Foundation/URLSession/http/libcurlHelpers.swift',
'Foundation/URLSession/libcurl/libcurlHelpers.swift',
'Foundation/URLSession/http/HTTPURLProtocol.swift',
'Foundation/UserDefaults.swift',
'Foundation/NSUUID.swift',
Expand Down