passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-01-22 08:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull out VPN implementations from App library

Browse Source 
And fix tests.
This commit is contained in:
Davide 2025-01-13 18:06:48 +01:00
parent 079f0ed7f4
commit a0092b3fad
No known key found for this signature in database
GPG Key ID: A48836171C759F5E
4 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Packages/App/Package.swift
View File

@ -43,6 +43,10 @@ let package = Package(
name: "LegacyV2", name: "LegacyV2",
targets: ["LegacyV2"] targets: ["LegacyV2"]
), ),
.library(
name: "PassepartoutImplementations",
targets: ["PassepartoutImplementations"]
),
.library( .library(
name: "TunnelLibrary", name: "TunnelLibrary",
targets: ["CommonLibrary"] targets: ["CommonLibrary"]
@ -57,6 +61,7 @@ let package = Package(
) )
], ],
dependencies: [ dependencies: [
.package(path: "../PassepartoutKit-Framework"),
.package(path: "../PassepartoutOpenVPNOpenSSL"), .package(path: "../PassepartoutOpenVPNOpenSSL"),
.package(path: "../PassepartoutWireGuardGo"), .package(path: "../PassepartoutWireGuardGo"),
.package(url: "https://github.com/Cocoanetics/Kvitto", from: "1.0.0") .package(url: "https://github.com/Cocoanetics/Kvitto", from: "1.0.0")
@ -144,8 +149,7 @@ let package = Package(
dependencies: [ dependencies: [
"CommonIAP", "CommonIAP",
"CommonUtils", "CommonUtils",
"PassepartoutOpenVPNOpenSSL", "PassepartoutKit-Framework"
"PassepartoutWireGuardGo"
], ],
resources: [ resources: [
.process("Resources") .process("Resources")
@ -157,11 +161,21 @@ let package = Package(
), ),
.target( .target(
name: "LegacyV2", name: "LegacyV2",
dependencies: ["CommonLibrary"], dependencies: [
"CommonLibrary",
"PassepartoutImplementations"
],
resources: [ resources: [
.process("Profiles.xcdatamodeld") .process("Profiles.xcdatamodeld")
] ]
), ),
.target(
name: "PassepartoutImplementations",
dependencies: [
"PassepartoutOpenVPNOpenSSL",
"PassepartoutWireGuardGo"
]
),
.target( .target(
name: "UIAccessibility" name: "UIAccessibility"
), ),

1
Packages/App/Sources/PassepartoutImplementations/Dummy.swift Normal file
View File

@ -0,0 +1 @@

6
Packages/PassepartoutOpenVPNOpenSSL/Tests/PassepartoutOpenVPNOpenSSLTests/NetworkSettingsBuilderTests.swift
View File

@ -270,7 +270,7 @@ final class NetworkSettingsBuilderTests: XCTestCase {
// MARK: MTU // MARK: MTU
func test_givenSettings_whenBuildMTU_thenReturnsLocalMTU() throws { func test_givenSettings_whenBuildMTU_thenReturnsLocalMTU() throws {
var sut: OpenVPN.NetworkSettingsBuilder var sut: NetworkSettingsBuilder
var localOptions = OpenVPN.Configuration.Builder() var localOptions = OpenVPN.Configuration.Builder()
var remoteOptions = OpenVPN.Configuration.Builder() var remoteOptions = OpenVPN.Configuration.Builder()
@ -304,8 +304,8 @@ private extension NetworkSettingsBuilderTests {
func newBuilder( func newBuilder(
with remoteOptions: OpenVPN.Configuration.Builder, with remoteOptions: OpenVPN.Configuration.Builder,
localOptions: OpenVPN.Configuration.Builder? = nil localOptions: OpenVPN.Configuration.Builder? = nil
) throws -> OpenVPN.NetworkSettingsBuilder { ) throws -> NetworkSettingsBuilder {
OpenVPN.NetworkSettingsBuilder( NetworkSettingsBuilder(
localOptions: try (localOptions ?? OpenVPN.Configuration.Builder()).tryBuild(isClient: false), localOptions: try (localOptions ?? OpenVPN.Configuration.Builder()).tryBuild(isClient: false),
remoteOptions: try remoteOptions.tryBuild(isClient: false) remoteOptions: try remoteOptions.tryBuild(isClient: false)
) )

14
Passepartout.xcodeproj/project.pbxproj
View File

@ -48,6 +48,8 @@
0EAEC8A92D05DB8D001AA50C /* DefaultAppProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EAEC8A62D05DB8D001AA50C /* DefaultAppProcessor.swift */; }; 0EAEC8A92D05DB8D001AA50C /* DefaultAppProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EAEC8A62D05DB8D001AA50C /* DefaultAppProcessor.swift */; };
0EAEC8AA2D05DB8D001AA50C /* DefaultTunnelProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EAEC8A72D05DB8D001AA50C /* DefaultTunnelProcessor.swift */; }; 0EAEC8AA2D05DB8D001AA50C /* DefaultTunnelProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EAEC8A72D05DB8D001AA50C /* DefaultTunnelProcessor.swift */; };
0EB08B982CA46F4900A02591 /* AppPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0EB08B962CA46F4900A02591 /* AppPlist.strings */; }; 0EB08B982CA46F4900A02591 /* AppPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0EB08B962CA46F4900A02591 /* AppPlist.strings */; };
0EB847EA2D35807400B5B205 /* PassepartoutImplementations in Frameworks */ = {isa = PBXBuildFile; productRef = 0EB847E92D35807400B5B205 /* PassepartoutImplementations */; };
0EB847EC2D35807A00B5B205 /* PassepartoutImplementations in Frameworks */ = {isa = PBXBuildFile; productRef = 0EB847EB2D35807A00B5B205 /* PassepartoutImplementations */; };
0EBE80DC2BF55C0E00E36A20 /* TunnelLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 0EBE80DB2BF55C0E00E36A20 /* TunnelLibrary */; }; 0EBE80DC2BF55C0E00E36A20 /* TunnelLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 0EBE80DB2BF55C0E00E36A20 /* TunnelLibrary */; };
0EC066D12C7DC47600D88A94 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0EC066D02C7DC47600D88A94 /* LaunchScreen.storyboard */; platformFilter = ios; }; 0EC066D12C7DC47600D88A94 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0EC066D02C7DC47600D88A94 /* LaunchScreen.storyboard */; platformFilter = ios; };
0EC332CA2B8A1808000B9C2F /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EC332C92B8A1808000B9C2F /* NetworkExtension.framework */; }; 0EC332CA2B8A1808000B9C2F /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EC332C92B8A1808000B9C2F /* NetworkExtension.framework */; };
@ -293,6 +295,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
0EBE80DC2BF55C0E00E36A20 /* TunnelLibrary in Frameworks */, 0EBE80DC2BF55C0E00E36A20 /* TunnelLibrary in Frameworks */,
0EB847EA2D35807400B5B205 /* PassepartoutImplementations in Frameworks */,
0EC332CA2B8A1808000B9C2F /* NetworkExtension.framework in Frameworks */, 0EC332CA2B8A1808000B9C2F /* NetworkExtension.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@ -304,6 +307,7 @@
0E3E22982CE53510005135DF /* AppUITV in Frameworks */, 0E3E22982CE53510005135DF /* AppUITV in Frameworks */,
0EF5FE4F2CE53BCE00EC2CD4 /* LegacyV2 in Frameworks */, 0EF5FE4F2CE53BCE00EC2CD4 /* LegacyV2 in Frameworks */,
0E3E22962CE53510005135DF /* AppUIMain in Frameworks */, 0E3E22962CE53510005135DF /* AppUIMain in Frameworks */,
0EB847EC2D35807A00B5B205 /* PassepartoutImplementations in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -594,6 +598,7 @@
0E3E22952CE53510005135DF /* AppUIMain */, 0E3E22952CE53510005135DF /* AppUIMain */,
0E3E22972CE53510005135DF /* AppUITV */, 0E3E22972CE53510005135DF /* AppUITV */,
0EF5FE4E2CE53BCE00EC2CD4 /* LegacyV2 */, 0EF5FE4E2CE53BCE00EC2CD4 /* LegacyV2 */,
0EB847EB2D35807A00B5B205 /* PassepartoutImplementations */,
); );
productName = PassepartoutKit; productName = PassepartoutKit;
productReference = 0E06D18F2B87629100176E1D /* Passepartout.app */; productReference = 0E06D18F2B87629100176E1D /* Passepartout.app */;
@ -671,6 +676,7 @@
name = PassepartoutTunnel; name = PassepartoutTunnel;
packageProductDependencies = ( packageProductDependencies = (
0EBE80DB2BF55C0E00E36A20 /* TunnelLibrary */, 0EBE80DB2BF55C0E00E36A20 /* TunnelLibrary */,
0EB847E92D35807400B5B205 /* PassepartoutImplementations */,
); );
productName = Tunnel; productName = Tunnel;
productReference = 0EC332C82B8A1808000B9C2F /* PassepartoutTunnel.appex */; productReference = 0EC332C82B8A1808000B9C2F /* PassepartoutTunnel.appex */;
@ -1582,6 +1588,14 @@
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
productName = UIAccessibility; productName = UIAccessibility;
}; };
0EB847E92D35807400B5B205 /* PassepartoutImplementations */ = {
isa = XCSwiftPackageProductDependency;
productName = PassepartoutImplementations;
};
0EB847EB2D35807A00B5B205 /* PassepartoutImplementations */ = {
isa = XCSwiftPackageProductDependency;
productName = PassepartoutImplementations;
};
0EBE80DB2BF55C0E00E36A20 /* TunnelLibrary */ = { 0EBE80DB2BF55C0E00E36A20 /* TunnelLibrary */ = {
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
productName = TunnelLibrary; productName = TunnelLibrary;