Fix some issues with monorepo refactoring

- Update app library location in scripts env
- Move Demo to subfolder to only have one .xcodeproj at root
- Fix submdoule pointer

Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "generic-json-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/iwill/generic-json-swift",
+      "state" : {
+        "revision" : "0a06575f4038b504e78ac330913d920f1630f510",
+        "version" : "2.0.2"
+      }
+    },
     {
       "identity" : "openssl-apple",
       "kind" : "remoteSourceControl",

Demo/Demo/ExternalDependencies/Package.swift

@@ -17,9 +17,9 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(path: "../../Packages/PassepartoutKit-Framework"),
+        .package(path: "../../../Packages/PassepartoutKit-Framework"),
-        .package(path: "../../Packages/PassepartoutOpenVPNOpenSSL"),
+        .package(path: "../../../Packages/PassepartoutOpenVPNOpenSSL"),
-        .package(path: "../../Packages/PassepartoutWireGuardGo")
+        .package(path: "../../../Packages/PassepartoutWireGuardGo")
     ],
     targets: [
         .target(

Packages/PassepartoutKit

@@ -1 +1 @@
-Subproject commit 88710d815b5af300d9a714d42807d5bddeb97bed
+Subproject commit 1560c52ef812271b59526f554593da6c0f653d59

fastlane/.env

@@ -6,3 +6,5 @@ SCAN_SCHEME="Passepartout"
 FL_VERSION_NUMBER_TARGET="Passepartout"
 FL_BUILD_NUMBER_PROJECT="Passepartout.xcodeproj"
 PILOT_BETA_APP_DESCRIPTION="Passepartout is your go-to app for VPN and privacy."
+
+API_PACKAGE_PATH="Packages/App/Sources/CommonAPI/API"

fastlane/Fastfile

@@ -18,7 +18,7 @@ fastlane_require "fileutils"
 Dotenv.load ".env.secret"
 
 setup_ci if ENV["CI"]
-api = "Library/Sources/CommonAPI/API"
+api = ENV["API_PACKAGE_PATH"]
 metadata = "fastlane/metadata"
 logname = "CHANGELOG.txt"
 build_path = "build"

scripts/env.sh

@@ -7,6 +7,6 @@ metadata_path="default/release_notes.txt"
 api_git="https://github.com/passepartoutvpn/api"
 api_version="v5"
 api_path=".api"
-api_package_path="Library/Sources/CommonAPI/API"
+api_package_path="Packages/App/Sources/CommonAPI/API"
 translations_input_path="l10n"
-translations_output_path="Library/Sources/UILibrary/Resources"
+translations_output_path="Packages/App/Sources/UILibrary/Resources"