From e41ac446c6c15a6cfc5e714f0529a4c8bd054ba8 Mon Sep 17 00:00:00 2001 From: Davide Date: Wed, 15 Jan 2025 15:18:55 +0100 Subject: [PATCH] Rename submodule to PassepartoutKit-Source --- .gitmodules | 4 +- Packages/PassepartoutKit | 1 - .../PassepartoutKit-Framework/Package.swift | 8 +- Packages/PassepartoutKit-Source | 1 + Passepartout/Passepartout.xctestplan | 112 +++++++++--------- 5 files changed, 65 insertions(+), 61 deletions(-) delete mode 160000 Packages/PassepartoutKit create mode 160000 Packages/PassepartoutKit-Source diff --git a/.gitmodules b/.gitmodules index 8b841c17..3566a5b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "Packages/PassepartoutKit"] - path = Packages/PassepartoutKit +[submodule "Packages/PassepartoutKit-Source"] + path = Packages/PassepartoutKit-Source url = git@github.com:passepartoutvpn/passepartoutkit-source.git diff --git a/Packages/PassepartoutKit b/Packages/PassepartoutKit deleted file mode 160000 index 144e7ad1..00000000 --- a/Packages/PassepartoutKit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 144e7ad10a40d6edaf9796990c4b582acb93dbfd diff --git a/Packages/PassepartoutKit-Framework/Package.swift b/Packages/PassepartoutKit-Framework/Package.swift index 15edb338..0ce25c8d 100644 --- a/Packages/PassepartoutKit-Framework/Package.swift +++ b/Packages/PassepartoutKit-Framework/Package.swift @@ -19,7 +19,9 @@ enum Environment { case .localDevelopment, .onlineDevelopment: return [] case .production: - return [.package(path: "../PassepartoutKit")] + return [ + .package(path: "../PassepartoutKit-Source") + ] } } @@ -40,7 +42,9 @@ enum Environment { case .production: targets.append(.target( name: "Target", - dependencies: ["PassepartoutKit"] + dependencies: [ + .product(name: "PassepartoutKit", package: "PassepartoutKit-Source") + ] )) } targets.append(.testTarget( diff --git a/Packages/PassepartoutKit-Source b/Packages/PassepartoutKit-Source new file mode 160000 index 00000000..4e531892 --- /dev/null +++ b/Packages/PassepartoutKit-Source @@ -0,0 +1 @@ +Subproject commit 4e53189266faa3a78eeaf031addbfc1db575a16f diff --git a/Passepartout/Passepartout.xctestplan b/Passepartout/Passepartout.xctestplan index 09a42da3..bff7f8fe 100644 --- a/Passepartout/Passepartout.xctestplan +++ b/Passepartout/Passepartout.xctestplan @@ -14,9 +14,58 @@ "testTargets" : [ { "target" : { - "containerPath" : "container:Packages\/PassepartoutKit", - "identifier" : "PassepartoutSupportTests", - "name" : "PassepartoutSupportTests" + "containerPath" : "container:Packages\/PassepartoutOpenVPNOpenSSL", + "identifier" : "PassepartoutOpenVPNOpenSSLTests", + "name" : "PassepartoutOpenVPNOpenSSLTests" + } + }, + { + "target" : { + "containerPath" : "container:Packages\/PassepartoutWireGuardGo", + "identifier" : "PassepartoutWireGuardGoTests", + "name" : "PassepartoutWireGuardGoTests" + } + }, + { + "target" : { + "containerPath" : "container:Packages\/App", + "identifier" : "CommonLibraryTests", + "name" : "CommonLibraryTests" + } + }, + { + "target" : { + "containerPath" : "container:Packages\/PassepartoutKit-Source", + "identifier" : "PassepartoutCoreTests", + "name" : "PassepartoutCoreTests" + } + }, + { + "target" : { + "containerPath" : "container:Packages\/PassepartoutOpenVPNOpenSSL", + "identifier" : "CPassepartoutCryptoOpenSSLTests", + "name" : "CPassepartoutCryptoOpenSSLTests" + } + }, + { + "target" : { + "containerPath" : "container:Packages\/PassepartoutKit-Source", + "identifier" : "PassepartoutNETests", + "name" : "PassepartoutNETests" + } + }, + { + "target" : { + "containerPath" : "container:Packages\/PassepartoutKit-Source", + "identifier" : "PassepartoutOpenVPNTests", + "name" : "PassepartoutOpenVPNTests" + } + }, + { + "target" : { + "containerPath" : "container:Packages\/PassepartoutKit-Source", + "identifier" : "PassepartoutWireGuardTests", + "name" : "PassepartoutWireGuardTests" } }, { @@ -29,23 +78,9 @@ }, { "target" : { - "containerPath" : "container:Packages\/PassepartoutOpenVPNOpenSSL", - "identifier" : "PassepartoutOpenVPNOpenSSLTests", - "name" : "PassepartoutOpenVPNOpenSSLTests" - } - }, - { - "target" : { - "containerPath" : "container:Packages\/PassepartoutKit", - "identifier" : "PassepartoutOpenVPNTests", - "name" : "PassepartoutOpenVPNTests" - } - }, - { - "target" : { - "containerPath" : "container:Packages\/PassepartoutKit", - "identifier" : "PassepartoutNETests", - "name" : "PassepartoutNETests" + "containerPath" : "container:Packages\/PassepartoutKit-Source", + "identifier" : "PassepartoutSupportTests", + "name" : "PassepartoutSupportTests" } }, { @@ -57,21 +92,7 @@ }, { "target" : { - "containerPath" : "container:Packages\/App", - "identifier" : "CommonLibraryTests", - "name" : "CommonLibraryTests" - } - }, - { - "target" : { - "containerPath" : "container:Packages\/PassepartoutKit", - "identifier" : "PassepartoutCoreTests", - "name" : "PassepartoutCoreTests" - } - }, - { - "target" : { - "containerPath" : "container:Packages\/PassepartoutKit", + "containerPath" : "container:Packages\/PassepartoutKit-Source", "identifier" : "PassepartoutAPITests", "name" : "PassepartoutAPITests" } @@ -89,27 +110,6 @@ "identifier" : "LegacyV2Tests", "name" : "LegacyV2Tests" } - }, - { - "target" : { - "containerPath" : "container:Packages\/PassepartoutWireGuardGo", - "identifier" : "PassepartoutWireGuardGoTests", - "name" : "PassepartoutWireGuardGoTests" - } - }, - { - "target" : { - "containerPath" : "container:Packages\/PassepartoutKit", - "identifier" : "PassepartoutWireGuardTests", - "name" : "PassepartoutWireGuardTests" - } - }, - { - "target" : { - "containerPath" : "container:Packages\/PassepartoutOpenVPNOpenSSL", - "identifier" : "CPassepartoutCryptoOpenSSLTests", - "name" : "CPassepartoutCryptoOpenSSLTests" - } } ], "version" : 1