From ebaa8f08ff94e4cc08529b3701114302ae037dd6 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Sat, 6 Nov 2021 10:27:43 +0100
Subject: [PATCH] Fix approach to test target

- Test core Swift package, not project
- Commit package schemes to repository
---
 .env.beta                                     |  2 +
 .env.ios                                      |  2 +-
 .env.mac                                      |  2 +-
 .github/workflows/beta.yml                    |  2 +-
 .gitignore                                    |  2 -
 PassepartoutCore/.gitignore                   |  7 ++
 .../xcschemes/PassepartoutCore.xcscheme       | 77 +++++++++++++++++++
 .../xcschemes/PassepartoutCoreTests.xcscheme  | 52 +++++++++++++
 .../PassepartoutOpenVPNTunnel.xcscheme        | 67 ++++++++++++++++
 9 files changed, 208 insertions(+), 5 deletions(-)
 create mode 100644 PassepartoutCore/.gitignore
 create mode 100644 PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutCore.xcscheme
 create mode 100644 PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutCoreTests.xcscheme
 create mode 100644 PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutOpenVPNTunnel.xcscheme

diff --git a/.env.beta b/.env.beta
index ea37ca30..42e6610d 100644
--- a/.env.beta
+++ b/.env.beta
@@ -2,6 +2,8 @@ TARGET="beta"
 MATCH_TYPE="appstore"
 GYM_EXPORT_METHOD="app-store"
 GYM_SKIP_PACKAGE_PKG="false"
+SCAN_PACKAGE_PATH="PassepartoutCore"
+SCAN_SCHEME="PassepartoutCore"
 DEMO_ACCOUNT_REQUIRED="true"
 PILOT_DISTRIBUTE_EXTERNAL="true"
 PILOT_BETA_APP_DESCRIPTION="Passepartout is a non-official, user-friendly OpenVPN® client."
diff --git a/.env.ios b/.env.ios
index 6d4d7b14..0c3df28f 100644
--- a/.env.ios
+++ b/.env.ios
@@ -2,6 +2,6 @@ PLATFORM="ios"
 APP_ROOT="Passepartout/App/iOS"
 MATCH_PLATFORM="ios"
 GYM_SCHEME="Passepartout-iOS"
-SCAN_SCHEME="PassepartoutCore-iOS"
+SCAN_DEVICE="Any iPhone"
 DELIVER_PLATFORM="ios"
 PILOT_PLATFORM="ios"
diff --git a/.env.mac b/.env.mac
index 6fa64a66..d51d9537 100644
--- a/.env.mac
+++ b/.env.mac
@@ -3,6 +3,6 @@ APP_ROOT="Passepartout/App/macOS"
 MATCH_PLATFORM="macos"
 MATCH_ADDITIONAL_CERT_TYPES="mac_installer_distribution"
 GYM_SCHEME="Passepartout-macOS"
-SCAN_SCHEME="PassepartoutCore-macOS"
+SCAN_DEVICE="Any Mac"
 DELIVER_PLATFORM="osx"
 PILOT_PLATFORM="osx"
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index ab5a37b7..1385a8a0 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Run tests (macOS)
         if: github.ref == 'refs/heads/master'
         run: |
-          bundle exec fastlane --env mac test_target
+          bundle exec fastlane --env mac,beta test_target
       - name: Build (macOS)
         if: github.ref == 'refs/heads/stable'
         run: |
diff --git a/.gitignore b/.gitignore
index ee95bdd8..af743ce4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,3 @@ default.profraw
 asc-key.json
 .bundle
 vendor/
-.build
-.swiftpm
diff --git a/PassepartoutCore/.gitignore b/PassepartoutCore/.gitignore
new file mode 100644
index 00000000..bb460e7b
--- /dev/null
+++ b/PassepartoutCore/.gitignore
@@ -0,0 +1,7 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutCore.xcscheme b/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutCore.xcscheme
new file mode 100644
index 00000000..79bd10d3
--- /dev/null
+++ b/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutCore.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1310"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PassepartoutCore"
+               BuildableName = "PassepartoutCore"
+               BlueprintName = "PassepartoutCore"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PassepartoutCoreTests"
+               BuildableName = "PassepartoutCoreTests"
+               BlueprintName = "PassepartoutCoreTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "PassepartoutCore"
+            BuildableName = "PassepartoutCore"
+            BlueprintName = "PassepartoutCore"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutCoreTests.xcscheme b/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutCoreTests.xcscheme
new file mode 100644
index 00000000..385157fc
--- /dev/null
+++ b/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutCoreTests.xcscheme
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1310"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PassepartoutCoreTests"
+               BuildableName = "PassepartoutCoreTests"
+               BlueprintName = "PassepartoutCoreTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutOpenVPNTunnel.xcscheme b/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutOpenVPNTunnel.xcscheme
new file mode 100644
index 00000000..176fa5f3
--- /dev/null
+++ b/PassepartoutCore/.swiftpm/xcode/xcshareddata/xcschemes/PassepartoutOpenVPNTunnel.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1310"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PassepartoutOpenVPNTunnel"
+               BuildableName = "PassepartoutOpenVPNTunnel"
+               BlueprintName = "PassepartoutOpenVPNTunnel"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "PassepartoutOpenVPNTunnel"
+            BuildableName = "PassepartoutOpenVPNTunnel"
+            BlueprintName = "PassepartoutOpenVPNTunnel"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>