From 30889619fd2684aaf084baf090559d4848bdbde5 Mon Sep 17 00:00:00 2001
From: Arkadiusz Fal <arek@arekf.net>
Date: Mon, 15 Aug 2022 17:14:09 +0200
Subject: [PATCH] Use altool to upload builds

---
 Gemfile             |  3 +++
 Gemfile.lock        |  7 +++++++
 fastlane/Fastfile   | 21 ++++++++++++---------
 fastlane/Pluginfile |  5 +++++
 4 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 fastlane/Pluginfile

diff --git a/Gemfile b/Gemfile
index 7a118b49..cdd3a6b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,6 @@
 source "https://rubygems.org"
 
 gem "fastlane"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ed3fac3..66beb04f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,9 @@
+GIT
+  remote: git@github.com:yattee/fastlane-plugin-altool.git
+  revision: 4390a87c61f68a0efabb76236606d9861708bd46
+  specs:
+    fastlane-plugin-altool (1.1.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -213,6 +219,7 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane
+  fastlane-plugin-altool!
 
 BUNDLED WITH
    2.3.6
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 7bf82dd0..7216035b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -26,8 +26,6 @@ end
 platform :ios do
   desc "Push a new beta build to TestFlight"
   lane :beta do
-    xcode_select("/Applications/Xcode-13.4.1.app")
-
     app_store_connect_api_key(
       key_id: DEVELOPER_KEY_ID,
       issuer_id: DEVELOPER_KEY_ISSUER_ID,
@@ -46,15 +44,16 @@ platform :ios do
       output_name: "Yattee-#{version}-iOS.ipa",
     )
 
-    upload_to_testflight
+    altool(
+      altool_app_type: "ios",
+      altool_ipa_path: lane_context[SharedValues::IPA_OUTPUT_PATH]
+    )
   end
 end
 
 platform :tvos do
   desc "Push a new beta build to TestFlight"
   lane :beta do
-    xcode_select("/Applications/Xcode-13.4.1.app")
-
     app_store_connect_api_key(
       key_id: DEVELOPER_KEY_ID,
       issuer_id: DEVELOPER_KEY_ISSUER_ID,
@@ -73,15 +72,16 @@ platform :tvos do
       output_name: "Yattee-#{version}-tvOS.ipa",
     )
 
-    upload_to_testflight
+    altool(
+      altool_app_type: "tvos",
+      altool_ipa_path: lane_context[SharedValues::IPA_OUTPUT_PATH]
+    )
   end
 end
 
 platform :mac do
   desc "Push a new beta build to TestFlight"
   lane :beta do
-    xcode_select("/Applications/Xcode-13.4.1.app")
-
     app_store_connect_api_key(
       key_id: DEVELOPER_KEY_ID,
       issuer_id: DEVELOPER_KEY_ISSUER_ID,
@@ -100,6 +100,9 @@ platform :mac do
       output_name: "Yattee-#{version}-macOS.app",
     )
 
-    upload_to_testflight
+    altool(
+      altool_app_type: "macos",
+      altool_ipa_path: lane_context[SharedValues::PKG_OUTPUT_PATH]
+    )
   end
 end
diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile
new file mode 100644
index 00000000..228fbe70
--- /dev/null
+++ b/fastlane/Pluginfile
@@ -0,0 +1,5 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-altool', git: "git@github.com:yattee/fastlane-plugin-altool.git"