Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
91 changes: 91 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
// swift-tools-version: 5.9
import PackageDescription

let package = Package(
name: "WebDriverAgent",
defaultLocalization: "en",
platforms: [
.iOS(.v12)
],
products: [
// Expose the Obj-C library as a SwiftPM product so it can be imported from Swift.
.library(name: "WebDriverAgentLib", targets: ["WebDriverAgentLib"])
],
targets: [
// ---- Vendor: CocoaAsyncSocket ----
.target(
name: "CocoaAsyncSocket",
path: "WebDriverAgentLib/Vendor/CocoaAsyncSocket",
publicHeadersPath: "."
),

// ---- Vendor: CocoaHTTPServer ----
.target(
name: "CocoaHTTPServer",
dependencies: ["CocoaAsyncSocket"],
path: "WebDriverAgentLib/Vendor/CocoaHTTPServer",
publicHeadersPath: ".",
cSettings: [
.headerSearchPath("Categories"),
.headerSearchPath("Responses")
]
),

// ---- Vendor: RoutingHTTPServer ----
.target(
name: "RoutingHTTPServer",
dependencies: ["CocoaHTTPServer"],
path: "WebDriverAgentLib/Vendor/RoutingHTTPServer",
publicHeadersPath: ".",
cSettings: [
// Need CocoaHTTPServer headers in include path for quote-style imports
.headerSearchPath("../CocoaHTTPServer"),
.headerSearchPath("../CocoaHTTPServer/Responses"),
.headerSearchPath("../CocoaHTTPServer/Categories")
]
),

// ---- Main library ----
.target(
name: "WebDriverAgentLib",
dependencies: [
"RoutingHTTPServer"
],
path: "WebDriverAgentLib",
exclude: [
"Vendor" // compiled in dedicated targets above
],
publicHeadersPath: "include",
cSettings: [
.headerSearchPath(".."),
.headerSearchPath("include"),
.headerSearchPath("Routing"),
.headerSearchPath("Utilities"),
.headerSearchPath("Utilities/LRUCache"),
.headerSearchPath("Categories"),
.headerSearchPath("Commands"),
.headerSearchPath("include/WebDriverAgentLib"),
.headerSearchPath("../PrivateHeaders/XCTest"),
.headerSearchPath("../PrivateHeaders/MobileCoreServices"),
.headerSearchPath("../PrivateHeaders/AccessibilityUtilities"),
.headerSearchPath("../PrivateHeaders/TextInput"),
.headerSearchPath("../PrivateHeaders/UIKitCore"),
],
linkerSettings: [
// Link against XCTest and system UIKit/Foundation frameworks that
// are referenced across the Objective-C implementation files.
.linkedFramework("XCTest"),
.linkedFramework("UIKit"),
.linkedFramework("Foundation"),
.linkedFramework("MobileCoreServices"),
.linkedFramework("UniformTypeIdentifiers")
]
),
// Unit-test target (optional – keeps parity with the original project).
.testTarget(
name: "WebDriverAgentLibTests",
dependencies: ["WebDriverAgentLib"],
path: "WebDriverAgentTests"
)
]
)
14 changes: 7 additions & 7 deletions WebDriverAgent.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
13DE7A4A287C4005003243C6 /* FBXCDeviceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A47287C4005003243C6 /* FBXCDeviceEvent.h */; };
13DE7A4B287C4005003243C6 /* FBXCDeviceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A48287C4005003243C6 /* FBXCDeviceEvent.m */; };
13DE7A4C287C4005003243C6 /* FBXCDeviceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A48287C4005003243C6 /* FBXCDeviceEvent.m */; };
13DE7A4F287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A4D287C46BB003243C6 /* FBXCElementSnapshot.h */; };
13DE7A50287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A4D287C46BB003243C6 /* FBXCElementSnapshot.h */; };
13DE7A4F287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A4D287C46BB003243C6 /* FBXCElementSnapshot.h */; settings = {ATTRIBUTES = (Public, ); }; };
13DE7A50287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A4D287C46BB003243C6 /* FBXCElementSnapshot.h */; settings = {ATTRIBUTES = (Public, ); }; };
13DE7A51287C46BB003243C6 /* FBXCElementSnapshot.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A4E287C46BB003243C6 /* FBXCElementSnapshot.m */; };
13DE7A52287C46BB003243C6 /* FBXCElementSnapshot.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A4E287C46BB003243C6 /* FBXCElementSnapshot.m */; };
13DE7A55287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; };
13DE7A56287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; };
13DE7A55287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
13DE7A56287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
13DE7A57287CA1EC003243C6 /* FBXCElementSnapshotWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A54287CA1EC003243C6 /* FBXCElementSnapshotWrapper.m */; };
13DE7A58287CA1EC003243C6 /* FBXCElementSnapshotWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A54287CA1EC003243C6 /* FBXCElementSnapshotWrapper.m */; };
13DE7A5B287CA444003243C6 /* FBXCElementSnapshotWrapper+Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A59287CA444003243C6 /* FBXCElementSnapshotWrapper+Helpers.h */; };
Expand Down Expand Up @@ -2300,6 +2300,8 @@
641EE6392240C5CA00173FCB /* FBRouteRequest.h in Headers */,
648C10AC22AAAD9C00B81B9A /* UIKeyboardImpl.h in Headers */,
718226CD2587443700661B83 /* GCDAsyncSocket.h in Headers */,
13DE7A50287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */,
13DE7A56287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */,
71F3E7D525417FF400E0C22B /* FBSettings.h in Headers */,
641EE63A2240C5CA00173FCB /* XCTest.h in Headers */,
641EE63B2240C5CA00173FCB /* FBAlertsMonitor.h in Headers */,
Expand Down Expand Up @@ -2348,7 +2350,6 @@
641EE6632240C5CA00173FCB /* FBUnknownCommands.h in Headers */,
641EE7062240CDCF00173FCB /* XCUIElement+FBTVFocuse.h in Headers */,
71822738258744B800661B83 /* HTTPConnection.h in Headers */,
13DE7A56287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */,
641EE6642240C5CA00173FCB /* NSPredicate+FBFormat.h in Headers */,
641EE6652240C5CA00173FCB /* UILongPressGestureRecognizer-RecordingAdditions.h in Headers */,
641EE6662240C5CA00173FCB /* XCTestCase.h in Headers */,
Expand Down Expand Up @@ -2510,7 +2511,6 @@
641EE6E72240C5CA00173FCB /* XCUIElement+FBFind.h in Headers */,
641EE6E82240C5CA00173FCB /* XCTestManager_ManagerInterface-Protocol.h in Headers */,
641EE6E92240C5CA00173FCB /* FBFailureProofTestCase.h in Headers */,
13DE7A50287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */,
641EE6EA2240C5CA00173FCB /* XCTTestRunSessionDelegate-Protocol.h in Headers */,
641EE6EB2240C5CA00173FCB /* XCTestCaseSuite.h in Headers */,
641EE6EC2240C5CA00173FCB /* _XCInternalTestRun.h in Headers */,
Expand Down Expand Up @@ -2581,6 +2581,7 @@
EE35AD721E3B77D600A02D78 /* XCUIElementHitPointCoordinate.h in Headers */,
EE35AD3F1E3B77D600A02D78 /* XCTDarwinNotificationExpectation.h in Headers */,
EE35AD5F1E3B77D600A02D78 /* XCTRunnerAutomationSession.h in Headers */,
13DE7A4F287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */,
71C9EAAC25E8415A00470CD8 /* FBScreenshot.h in Headers */,
EE35AD371E3B77D600A02D78 /* XCSourceCodeTreeNodeEnumerator.h in Headers */,
EE158AB01CBD456F00A3E3F0 /* XCUIElement+FBIsVisible.h in Headers */,
Expand Down Expand Up @@ -2678,7 +2679,6 @@
EE158AB81CBD456F00A3E3F0 /* FBAlertViewCommands.h in Headers */,
EE35AD651E3B77D600A02D78 /* XCTWaiter.h in Headers */,
EE35AD681E3B77D600A02D78 /* XCTWaiterManagement-Protocol.h in Headers */,
13DE7A4F287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */,
EE35AD451E3B77D600A02D78 /* XCTestContext.h in Headers */,
EE35AD661E3B77D600A02D78 /* XCTWaiterDelegate-Protocol.h in Headers */,
EE35AD0E1E3B77D600A02D78 /* _XCTestExpectationImplementation.h in Headers */,
Expand Down
2 changes: 1 addition & 1 deletion WebDriverAgentLib/Categories/XCUIElement+FBAccessibility.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

#import <WebDriverAgentLib/XCUIElement.h>
#import "FBXCElementSnapshotWrapper.h"
#import <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#import "FBXCElementSnapshotWrapper.h"
#import <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion WebDriverAgentLib/Categories/XCUIElement+FBUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#import <XCTest/XCTest.h>
#import <WebDriverAgentLib/FBElement.h>
#import "FBXCElementSnapshot.h"
#import <WebDriverAgentLib/FBXCElementSnapshot.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#import <WebDriverAgentLib/FBElement.h>
#import <WebDriverAgentLib/XCUIElement.h>
#import "FBXCElementSnapshotWrapper.h"
#import <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion WebDriverAgentLib/Utilities/FBXPath.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#import <XCTest/XCTest.h>
#import <WebDriverAgentLib/FBElement.h>
#import "FBXCElementSnapshot.h"
#import <WebDriverAgentLib/FBXCElementSnapshot.h>

#ifdef __clang__
#pragma clang diagnostic push
Expand Down
9 changes: 9 additions & 0 deletions WebDriverAgentLib/WebDriverAgentLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ FOUNDATION_EXPORT double WebDriverAgentLib_VersionNumber;
//! Project version string for WebDriverAgentLib_.
FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];

#import <WebDriverAgentLib/CDStructures.h>
#import <WebDriverAgentLib/FBAlert.h>
#import <WebDriverAgentLib/FBCommandHandler.h>
#import <WebDriverAgentLib/FBCommandStatus.h>
Expand All @@ -38,9 +39,17 @@ FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];
#import <WebDriverAgentLib/FBRuntimeUtils.h>
#import <WebDriverAgentLib/FBSession.h>
#import <WebDriverAgentLib/FBWebServer.h>
#import <WebDriverAgentLib/FBXCElementSnapshot.h>
#import <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>
#import <WebDriverAgentLib/FBXPath.h>
#import <WebDriverAgentLib/WebDriverAgentLib.h>
#import <WebDriverAgentLib/XCDebugLogDelegate-Protocol.h>
#import <WebDriverAgentLib/XCTestCase.h>
#import <WebDriverAgentLib/XCTIssue+FBPatcher.h>
#import <WebDriverAgentLib/XCUIApplication+FBHelpers.h>
#import <WebDriverAgentLib/XCUIDevice+FBHelpers.h>
#import <WebDriverAgentLib/XCUIDevice+FBRotation.h>
#import <WebDriverAgentLib/XCUIElement.h>
#import <WebDriverAgentLib/XCUIElement+FBAccessibility.h>
#import <WebDriverAgentLib/XCUIElement+FBFind.h>
#import <WebDriverAgentLib/XCUIElement+FBIsVisible.h>
Expand Down
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/CDStructures.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBAlert.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBElement.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBKeyboard.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBLogger.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBMacros.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBRoute.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBSession.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBWebServer.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/FBXPath.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/XCTestCase.h
1 change: 1 addition & 0 deletions WebDriverAgentLib/include/WebDriverAgentLib/XCUIElement.h
Loading
Loading