From a0be83a499adb5ebb1ec9bb1faa31b4ab2228a0f Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Wed, 6 Jan 2021 16:43:41 +0100
Subject: [PATCH] Set up to upload Mac build to App Store

- Do not skip .pkg for Mac App Store builds (beta)
- Add store_deploy lane
---
 .env.beta        | 2 --
 .env.beta.ios    | 3 +++
 .env.beta.mac    | 2 ++
 .env.ios         | 1 +
 .env.mac         | 1 +
 fastlane/Gymfile | 1 -
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env.beta b/.env.beta
index 26e2f7cc..45f84b7c 100644
--- a/.env.beta
+++ b/.env.beta
@@ -1,4 +1,2 @@
 TARGET="beta"
-PILOT_IPA="$DIST_PATH/$PLATFORM/$TARGET/$APP_NAME.ipa"
-PILOT_DISTRIBUTE_EXTERNAL="true"
 DEMO_ACCOUNT_REQUIRED="true"
diff --git a/.env.beta.ios b/.env.beta.ios
index 64a23f6a..50742dee 100644
--- a/.env.beta.ios
+++ b/.env.beta.ios
@@ -1,2 +1,5 @@
 MATCH_TYPE="appstore"
 GYM_EXPORT_METHOD="app-store"
+DELIVER_IPA_PATH="$DIST_PATH/$PLATFORM/$TARGET/$APP_NAME.ipa"
+PILOT_IPA="$DIST_PATH/$PLATFORM/$TARGET/$APP_NAME.ipa"
+PILOT_DISTRIBUTE_EXTERNAL="true"
diff --git a/.env.beta.mac b/.env.beta.mac
index 64a23f6a..97232640 100644
--- a/.env.beta.mac
+++ b/.env.beta.mac
@@ -1,2 +1,4 @@
 MATCH_TYPE="appstore"
 GYM_EXPORT_METHOD="app-store"
+GYM_SKIP_PACKAGE_PKG="false"
+DELIVER_PKG_PATH="$DIST_PATH/$PLATFORM/$TARGET/$APP_NAME.pkg"
diff --git a/.env.ios b/.env.ios
index 45d2db71..c5cc012a 100644
--- a/.env.ios
+++ b/.env.ios
@@ -1,4 +1,5 @@
 PLATFORM="ios"
+DELIVER_PLATFORM="ios"
 GYM_SCHEME="Passepartout-iOS"
 BUNDLE_CONTEXT="ios"
 APP_CONTEXT="iOS"
diff --git a/.env.mac b/.env.mac
index ef63be73..1f43f42b 100644
--- a/.env.mac
+++ b/.env.mac
@@ -1,4 +1,5 @@
 PLATFORM="mac"
+DELIVER_PLATFORM="osx"
 GYM_SCHEME="Passepartout-macOS"
 BUNDLE_CONTEXT="macos"
 APP_CONTEXT="macOS"
diff --git a/fastlane/Gymfile b/fastlane/Gymfile
index e4ed42cd..9312d42d 100644
--- a/fastlane/Gymfile
+++ b/fastlane/Gymfile
@@ -24,4 +24,3 @@ clean true
 silent false
 include_bitcode false
 skip_profile_detection true
-skip_package_pkg true