Skip to content
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

build: Import CocoaAsyncSocket using Carthage #350

Merged
merged 4 commits into from
Jun 13, 2020
Merged

build: Import CocoaAsyncSocket using Carthage #350

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ef9006
build: Import CocoaAsyncSocket using Carthage
qmfrederik Jun 12, 2020
bebe8ed
fix build error
KazuCocoa Jun 12, 2020
5427846
Merge pull request #2 from KazuCocoa/build-fix
qmfrederik Jun 12, 2020
13b0aec
Use latest version of CocoaAsyncSocket, remove workaround
qmfrederik Jun 13, 2020
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
3 changes: 3 additions & 0 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Used by the HTTP server
github "robbiehanson/CocoaAsyncSocket"

# Used by the element cache
github "appium/YYCache"
1 change: 1 addition & 0 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
github "robbiehanson/CocoaAsyncSocket" "7.6.4"
github "appium/YYCache" "1.1.0"
30 changes: 12 additions & 18 deletions WebDriverAgent.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,8 +432,6 @@
C8FB547422D3949C00B69954 /* LSApplicationWorkspace.h in Headers */ = {isa = PBXBuildFile; fileRef = C8FB547322D3949C00B69954 /* LSApplicationWorkspace.h */; };
C8FB547922D4C1FC00B69954 /* FBUnattachedAppLauncher.h in Headers */ = {isa = PBXBuildFile; fileRef = C8FB547722D4C1FC00B69954 /* FBUnattachedAppLauncher.h */; };
C8FB547A22D4C1FC00B69954 /* FBUnattachedAppLauncher.m in Sources */ = {isa = PBXBuildFile; fileRef = C8FB547822D4C1FC00B69954 /* FBUnattachedAppLauncher.m */; };
E444DC5024912F050060D7EB /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = E444DC4E24912F050060D7EB /* GCDAsyncSocket.h */; };
E444DC5124912F050060D7EB /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = E444DC4F24912F050060D7EB /* GCDAsyncSocket.m */; };
E444DC65249131890060D7EB /* HTTPErrorResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E444DC59249131880060D7EB /* HTTPErrorResponse.h */; };
E444DC67249131890060D7EB /* HTTPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E444DC5B249131880060D7EB /* HTTPDataResponse.m */; };
E444DC6C249131890060D7EB /* HTTPDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E444DC60249131890060D7EB /* HTTPDataResponse.h */; };
Expand Down Expand Up @@ -475,7 +473,10 @@
E444DCD224917A5E0060D7EB /* HTTPErrorResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E444DC61249131890060D7EB /* HTTPErrorResponse.m */; };
E444DCD424917A5E0060D7EB /* DDNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = E444DC7F249131B00060D7EB /* DDNumber.m */; };
E444DCD624917A5E0060D7EB /* DDRange.m in Sources */ = {isa = PBXBuildFile; fileRef = E444DC7E249131B00060D7EB /* DDRange.m */; };
E444DCD824917A5E0060D7EB /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = E444DC4F24912F050060D7EB /* GCDAsyncSocket.m */; };
E4C91FDA2493A41000C9FC04 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C91FD92493A41000C9FC04 /* CocoaAsyncSocket.framework */; };
E4C91FDB2493A41000C9FC04 /* CocoaAsyncSocket.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = E4C91FD92493A41000C9FC04 /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E4C91FDD2493A41A00C9FC04 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C91FDC2493A41A00C9FC04 /* CocoaAsyncSocket.framework */; };
E4C91FDE2493A41A00C9FC04 /* CocoaAsyncSocket.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = E4C91FDC2493A41A00C9FC04 /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
EE006EAD1EB99B15006900A4 /* FBElementVisibilityTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE006EAC1EB99B15006900A4 /* FBElementVisibilityTests.m */; };
EE006EB01EBA1AA9006900A4 /* XCElementSnapshot+FBHitPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = EE006EAE1EBA1AA9006900A4 /* XCElementSnapshot+FBHitPoint.h */; };
EE006EB11EBA1AA9006900A4 /* XCElementSnapshot+FBHitPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = EE006EAF1EBA1AA9006900A4 /* XCElementSnapshot+FBHitPoint.m */; };
Expand Down Expand Up @@ -820,6 +821,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
E4C91FDE2493A41A00C9FC04 /* CocoaAsyncSocket.framework in Copy Frameworks */,
7155B41F224D5B770042A993 /* YYCache.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
Expand All @@ -843,6 +845,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
E4C91FDB2493A41000C9FC04 /* CocoaAsyncSocket.framework in Copy Frameworks */,
715D5777224DE17E00DA2D99 /* YYCache.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
Expand Down Expand Up @@ -989,8 +992,6 @@
C8FB547322D3949C00B69954 /* LSApplicationWorkspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSApplicationWorkspace.h; sourceTree = "<group>"; };
C8FB547722D4C1FC00B69954 /* FBUnattachedAppLauncher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBUnattachedAppLauncher.h; sourceTree = "<group>"; };
C8FB547822D4C1FC00B69954 /* FBUnattachedAppLauncher.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBUnattachedAppLauncher.m; sourceTree = "<group>"; };
E444DC4E24912F050060D7EB /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GCDAsyncSocket.h; path = WebDriverAgentLib/Vendor/CocoaAsyncSocket/GCDAsyncSocket.h; sourceTree = SOURCE_ROOT; };
E444DC4F24912F050060D7EB /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GCDAsyncSocket.m; path = WebDriverAgentLib/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m; sourceTree = SOURCE_ROOT; };
E444DC59249131880060D7EB /* HTTPErrorResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPErrorResponse.h; path = WebDriverAgentLib/Vendor/CocoaHTTPServer/Responses/HTTPErrorResponse.h; sourceTree = SOURCE_ROOT; };
E444DC5B249131880060D7EB /* HTTPDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTTPDataResponse.m; path = WebDriverAgentLib/Vendor/CocoaHTTPServer/Responses/HTTPDataResponse.m; sourceTree = SOURCE_ROOT; };
E444DC60249131890060D7EB /* HTTPDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPDataResponse.h; path = WebDriverAgentLib/Vendor/CocoaHTTPServer/Responses/HTTPDataResponse.h; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -1019,6 +1020,8 @@
E444DCA824913C220060D7EB /* RoutingHTTPServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RoutingHTTPServer.m; path = WebDriverAgentLib/Vendor/RoutingHTTPServer/RoutingHTTPServer.m; sourceTree = SOURCE_ROOT; };
E444DCA924913C220060D7EB /* RouteRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RouteRequest.m; path = WebDriverAgentLib/Vendor/RoutingHTTPServer/RouteRequest.m; sourceTree = SOURCE_ROOT; };
E444DCAA24913C220060D7EB /* RouteRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RouteRequest.h; path = WebDriverAgentLib/Vendor/RoutingHTTPServer/RouteRequest.h; sourceTree = SOURCE_ROOT; };
E4C91FD92493A41000C9FC04 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = Carthage/Build/iOS/CocoaAsyncSocket.framework; sourceTree = "<group>"; };
E4C91FDC2493A41A00C9FC04 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = Carthage/Build/tvOS/CocoaAsyncSocket.framework; sourceTree = "<group>"; };
EE006EAC1EB99B15006900A4 /* FBElementVisibilityTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBElementVisibilityTests.m; sourceTree = "<group>"; };
EE006EAE1EBA1AA9006900A4 /* XCElementSnapshot+FBHitPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCElementSnapshot+FBHitPoint.h"; sourceTree = "<group>"; };
EE006EAF1EBA1AA9006900A4 /* XCElementSnapshot+FBHitPoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCElementSnapshot+FBHitPoint.m"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1300,6 +1303,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E4C91FDD2493A41A00C9FC04 /* CocoaAsyncSocket.framework in Frameworks */,
7155B414224D5B170042A993 /* XCTest.framework in Frameworks */,
7155B41C224D5B5D0042A993 /* libxml2.tbd in Frameworks */,
7155B41B224D5B5A0042A993 /* libAccessibility.tbd in Frameworks */,
Expand All @@ -1320,6 +1324,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E4C91FDA2493A41000C9FC04 /* CocoaAsyncSocket.framework in Frameworks */,
7155B40E224D5A850042A993 /* libAccessibility.tbd in Frameworks */,
7155B424224D5BA10042A993 /* XCTest.framework in Frameworks */,
716C9347224D540C004B8542 /* libxml2.tbd in Frameworks */,
Expand Down Expand Up @@ -1530,6 +1535,8 @@
B6E83A410C45944B036B6B0F /* Frameworks */ = {
isa = PBXGroup;
children = (
E4C91FD92493A41000C9FC04 /* CocoaAsyncSocket.framework */,
E4C91FDC2493A41A00C9FC04 /* CocoaAsyncSocket.framework */,
716C9341224D5369004B8542 /* iOS */,
716C9340224D5358004B8542 /* tvOS */,
);
Expand All @@ -1549,20 +1556,10 @@
children = (
E444DC9E24913C080060D7EB /* RoutingHTTPServer */,
E444DC52249131050060D7EB /* CocoaHTTPServer */,
E444DC4D24912EEC0060D7EB /* CocoaAsyncSocket */,
);
name = Vendor;
sourceTree = "<group>";
};
E444DC4D24912EEC0060D7EB /* CocoaAsyncSocket */ = {
isa = PBXGroup;
children = (
E444DC4E24912F050060D7EB /* GCDAsyncSocket.h */,
E444DC4F24912F050060D7EB /* GCDAsyncSocket.m */,
);
name = CocoaAsyncSocket;
sourceTree = "<group>";
};
E444DC52249131050060D7EB /* CocoaHTTPServer */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2367,7 +2364,6 @@
EE35AD501E3B77D600A02D78 /* XCTestMisuseObserver.h in Headers */,
EE35AD601E3B77D600A02D78 /* XCTRunnerDaemonSession.h in Headers */,
64B2650A228CE4FF002A5025 /* FBTVNavigationTracker-Private.h in Headers */,
E444DC5024912F050060D7EB /* GCDAsyncSocket.h in Headers */,
EE158AF51CBD456F00A3E3F0 /* FBApplication.h in Headers */,
71B155DF23080CA600646AFB /* FBProtocolHelpers.h in Headers */,
EE35AD4B1E3B77D600A02D78 /* XCTestExpectationWaiter.h in Headers */,
Expand Down Expand Up @@ -2909,7 +2905,6 @@
E444DCD224917A5E0060D7EB /* HTTPErrorResponse.m in Sources */,
E444DCD424917A5E0060D7EB /* DDNumber.m in Sources */,
E444DCD624917A5E0060D7EB /* DDRange.m in Sources */,
E444DCD824917A5E0060D7EB /* GCDAsyncSocket.m in Sources */,
641EE5D72240C5CA00173FCB /* FBScreenshotCommands.m in Sources */,
641EE5D82240C5CA00173FCB /* FBPredicate.m in Sources */,
641EE5D92240C5CA00173FCB /* XCUIElement+FBPickerWheel.m in Sources */,
Expand Down Expand Up @@ -3083,7 +3078,6 @@
EE158AAF1CBD456F00A3E3F0 /* XCUIElement+FBAccessibility.m in Sources */,
7150348821A6DAD600A0F4BA /* FBImageUtils.m in Sources */,
E444DCAB24913C220060D7EB /* HTTPResponseProxy.m in Sources */,
E444DC5124912F050060D7EB /* GCDAsyncSocket.m in Sources */,
E444DC6D249131890060D7EB /* HTTPErrorResponse.m in Sources */,
EE158AE51CBD456F00A3E3F0 /* FBSession.m in Sources */,
E444DCB224913C220060D7EB /* RoutingConnection.m in Sources */,
Expand Down
6 changes: 5 additions & 1 deletion WebDriverAgentLib/Routing/FBTCPSocket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#import "GCDAsyncSocket.h"
#if __has_warning("-Watimport-in-framework-header")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say this is not necessary anymore after GCDAsyncSocket bump

#pragma clang diagnostic ignored "-Watimport-in-framework-header"
#endif

#import <CocoaAsyncSocket/GCDAsyncSocket.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion WebDriverAgentLib/Utilities/FBMjpegServer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#import <mach/mach_time.h>
#import <MobileCoreServices/MobileCoreServices.h>
#import "GCDAsyncSocket.h"
#import <CocoaAsyncSocket/GCDAsyncSocket.h>
#import "FBApplication.h"
#import "FBConfiguration.h"
#import "FBLogger.h"
Expand Down
4 changes: 0 additions & 4 deletions WebDriverAgentLib/Vendor/CocoaAsyncSocket/About.txt
View file
Open in desktop

This file was deleted.

Loading