Skip to content

Commit b84c7a2

Browse files
authored
Refactor for xplat building. (#140)
Compare to #139. I propose this is more correct for how we want to make this xplat. Verified this builds and runs on Mac and Windows, and Testing passes on both.
1 parent e6b4a6c commit b84c7a2

File tree

4 files changed

+25
-12
lines changed

4 files changed

+25
-12
lines changed

Package.swift

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,37 @@ import PackageDescription
55
let package = Package(
66
name: "swift-webdriver",
77
products: [
8-
.library(name: "WebDriver", targets: ["WebDriver", "WinAppDriver"]),
8+
.library(name: "WebDriver", targets: ["WebDriver"]),
99
],
1010
targets: [
1111
.target(
1212
name: "WebDriver",
1313
path: "Sources/WebDriver"),
14-
.target(
15-
name: "WinAppDriver",
16-
dependencies: ["WebDriver"],
17-
path: "Sources/WinAppDriver"),
1814
.target(
1915
name: "TestsCommon",
2016
path: "Tests/Common"),
21-
.testTarget(
22-
name: "WinAppDriverTests",
23-
dependencies: ["TestsCommon", "WebDriver", "WinAppDriver"],
24-
// Ignore "LNK4217: locally defined symbol imported" spew due to SPM library support limitations
25-
linkerSettings: [ .unsafeFlags(["-Xlinker", "-ignore:4217"]) ]),
2617
.testTarget(
2718
name: "UnitTests",
28-
dependencies: ["TestsCommon", "WebDriver", "WinAppDriver"],
19+
dependencies: ["TestsCommon", "WebDriver"],
2920
// Ignore "LNK4217: locally defined symbol imported" spew due to SPM library support limitations
30-
linkerSettings: [ .unsafeFlags(["-Xlinker", "-ignore:4217"]) ]),
21+
linkerSettings: [ .unsafeFlags(["-Xlinker", "-ignore:4217"], .when(platforms: [.windows])) ]),
3122
]
3223
)
24+
25+
#if os(Windows)
26+
package.products += [
27+
.library(name: "WinAppDriver", targets: ["WinAppDriver"])
28+
]
29+
package.targets += [
30+
.target(
31+
name: "WinAppDriver",
32+
dependencies: ["WebDriver"],
33+
path: "Sources/WinAppDriver"),
34+
.testTarget(
35+
name: "WinAppDriverTests",
36+
dependencies: ["TestsCommon", "WebDriver", "WinAppDriver"],
37+
// Ignore "LNK4217: locally defined symbol imported" spew due to SPM library support limitations
38+
linkerSettings: [ .unsafeFlags(["-Xlinker", "-ignore:4217"]) ]),
39+
]
40+
#endif
41+

Sources/WebDriver/HTTPWebDriver.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import Foundation
2+
#if canImport(FoundationNetworking)
23
import FoundationNetworking
4+
#endif
35

46
public struct HTTPWebDriver: WebDriver {
57
let rootURL: URL

Sources/WebDriver/URLRequestExtensions.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import Foundation
2+
#if canImport(FoundationNetworking)
23
import FoundationNetworking
4+
#endif
35

46
extension URLSession {
57
func dataTask(

0 commit comments

Comments
 (0)