Move all source files to Sources/
and rename WireGuardKit targets
Signed-off-by: Andrej Mihajlov <and@mullvad.net>
@ -10,24 +10,21 @@ let package = Package(
|
||||
.iOS(.v12)
|
||||
],
|
||||
products: [
|
||||
.library(name: "WireGuardKit", targets: ["WireGuardKit"])
|
||||
.library(name: "WireGuardKit", targets: ["WireGuardKitSwift"])
|
||||
],
|
||||
dependencies: [],
|
||||
targets: [
|
||||
.target(
|
||||
name: "WireGuardKit",
|
||||
dependencies: ["libwg-go", "WireGuardKitCTarget"],
|
||||
path: "WireGuardKit/Sources/WireGuardKit"
|
||||
name: "WireGuardKitSwift",
|
||||
dependencies: ["WireGuardKitGo", "WireGuardKitC"]
|
||||
),
|
||||
.target(
|
||||
name: "WireGuardKitCTarget",
|
||||
dependencies: [],
|
||||
path: "WireGuardKit/Sources/WireGuardKitCTarget"
|
||||
name: "WireGuardKitC",
|
||||
dependencies: []
|
||||
),
|
||||
.target(
|
||||
name: "libwg-go",
|
||||
name: "WireGuardKitGo",
|
||||
dependencies: [],
|
||||
path: "WireGuardKit/Sources/libwg-go",
|
||||
linkerSettings: [.linkedLibrary("wg-go")]
|
||||
)
|
||||
]
|
||||
|
@ -54,7 +54,7 @@ $ open ./WireGuard/WireGuard.xcodeproj
|
||||
the "External Build Tool Configuration":
|
||||
|
||||
```
|
||||
$BUILD_DIR/../../SourcePackages/checkouts/wireguard-apple/wireguard-go-bridge
|
||||
$BUILD_DIR/../../SourcePackages/checkouts/Sources/WireGuardGo
|
||||
```
|
||||
|
||||
- Switch to "Build Settings" and find `SDKROOT`.
|
||||
|
0
WireGuard/WireGuard/Base.lproj/InfoPlist.strings → Sources/WireGuardApp/Base.lproj/InfoPlist.strings
Before ![]() (image error) Size: 953 B After ![]() (image error) Size: 953 B ![]() ![]() |
Before ![]() (image error) Size: 19 KiB After ![]() (image error) Size: 19 KiB ![]() ![]() |
Before ![]() (image error) Size: 1.3 KiB After ![]() (image error) Size: 1.3 KiB ![]() ![]() |
Before ![]() (image error) Size: 3.3 KiB After ![]() (image error) Size: 3.3 KiB ![]() ![]() |
0
WireGuard/WireGuard/Tunnel/TunnelsManager.swift → Sources/WireGuardApp/Tunnel/TunnelsManager.swift
Before ![]() (image error) Size: 80 KiB After ![]() (image error) Size: 80 KiB ![]() ![]() |
Before ![]() (image error) Size: 865 B After ![]() (image error) Size: 865 B ![]() ![]() |
Before ![]() (image error) Size: 1.5 KiB After ![]() (image error) Size: 1.5 KiB ![]() ![]() |
Before ![]() (image error) Size: 1.5 KiB After ![]() (image error) Size: 1.5 KiB ![]() ![]() |
Before ![]() (image error) Size: 3.1 KiB After ![]() (image error) Size: 3.1 KiB ![]() ![]() |
Before ![]() (image error) Size: 1.1 KiB After ![]() (image error) Size: 1.1 KiB ![]() ![]() |
Before ![]() (image error) Size: 2.9 KiB After ![]() (image error) Size: 2.9 KiB ![]() ![]() |
Before ![]() (image error) Size: 2.9 KiB After ![]() (image error) Size: 2.9 KiB ![]() ![]() |
Before ![]() (image error) Size: 4.5 KiB After ![]() (image error) Size: 4.5 KiB ![]() ![]() |
Before ![]() (image error) Size: 1.5 KiB After ![]() (image error) Size: 1.5 KiB ![]() ![]() |
Before ![]() (image error) Size: 4.1 KiB After ![]() (image error) Size: 4.1 KiB ![]() ![]() |
Before ![]() (image error) Size: 4.1 KiB After ![]() (image error) Size: 4.1 KiB ![]() ![]() |
Before ![]() (image error) Size: 6.4 KiB After ![]() (image error) Size: 6.4 KiB ![]() ![]() |
Before ![]() (image error) Size: 6.4 KiB After ![]() (image error) Size: 6.4 KiB ![]() ![]() |
Before ![]() (image error) Size: 9.8 KiB After ![]() (image error) Size: 9.8 KiB ![]() ![]() |
Before ![]() (image error) Size: 3.9 KiB After ![]() (image error) Size: 3.9 KiB ![]() ![]() |
Before ![]() (image error) Size: 8.2 KiB After ![]() (image error) Size: 8.2 KiB ![]() ![]() |
Before ![]() (image error) Size: 9.1 KiB After ![]() (image error) Size: 9.1 KiB ![]() ![]() |
0
WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift → Sources/WireGuardApp/UI/iOS/ErrorPresenter.swift
0
WireGuard/WireGuard/UI/iOS/QuickActionItem.swift → Sources/WireGuardApp/UI/iOS/QuickActionItem.swift
0
WireGuard/WireGuard/UI/iOS/View/ButtonCell.swift → Sources/WireGuardApp/UI/iOS/View/ButtonCell.swift
0
WireGuard/WireGuard/UI/iOS/View/SwitchCell.swift → Sources/WireGuardApp/UI/iOS/View/SwitchCell.swift
Before ![]() (image error) Size: 88 KiB After ![]() (image error) Size: 88 KiB ![]() ![]() |
Before ![]() (image error) Size: 10 KiB After ![]() (image error) Size: 10 KiB ![]() ![]() |
Before ![]() (image error) Size: 1.1 KiB After ![]() (image error) Size: 1.1 KiB ![]() ![]() |
Before ![]() (image error) Size: 22 KiB After ![]() (image error) Size: 22 KiB ![]() ![]() |
Before ![]() (image error) Size: 22 KiB After ![]() (image error) Size: 22 KiB ![]() ![]() |
Before ![]() (image error) Size: 2.3 KiB After ![]() (image error) Size: 2.3 KiB ![]() ![]() |
Before ![]() (image error) Size: 2.3 KiB After ![]() (image error) Size: 2.3 KiB ![]() ![]() |
Before ![]() (image error) Size: 49 KiB After ![]() (image error) Size: 49 KiB ![]() ![]() |
Before ![]() (image error) Size: 49 KiB After ![]() (image error) Size: 49 KiB ![]() ![]() |
Before ![]() (image error) Size: 4.9 KiB After ![]() (image error) Size: 4.9 KiB ![]() ![]() |
Before ![]() (image error) Size: 978 B After ![]() (image error) Size: 978 B ![]() ![]() |