From 0a199ee61126feb8c8a462200cb4749d6eb3ba77 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Fri, 1 Jul 2022 14:24:42 +0300
Subject: [PATCH] Drop Mac catalyst support, update app version and tag format,
 update fastlane plugins

---
 ElementX.xcodeproj/project.pbxproj  | 10 ++++------
 ElementX/SupportingFiles/target.yml |  5 ++---
 Gemfile.lock                        |  6 +++---
 fastlane/Fastfile                   |  6 +++---
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 9ac4488fb..8fc874f76 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -2301,18 +2301,17 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = ElementX/SupportingFiles/ElementX.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 1.0.0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 7J4U792NQT;
 				INFOPLIST_FILE = ElementX/SupportingFiles/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.element.elementx;
 				PRODUCT_NAME = ElementX;
 				SDKROOT = iphoneos;
-				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "ElementX/SupportingFiles/ElementX-Bridging-Header.h";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -2324,18 +2323,17 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = ElementX/SupportingFiles/ElementX.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 1.0.0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 7J4U792NQT;
 				INFOPLIST_FILE = ElementX/SupportingFiles/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.element.elementx;
 				PRODUCT_NAME = ElementX;
 				SDKROOT = iphoneos;
-				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "ElementX/SupportingFiles/ElementX-Bridging-Header.h";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
diff --git a/ElementX/SupportingFiles/target.yml b/ElementX/SupportingFiles/target.yml
index 60b50752f..7bac9c265 100644
--- a/ElementX/SupportingFiles/target.yml
+++ b/ElementX/SupportingFiles/target.yml
@@ -51,10 +51,9 @@ targets:
       base:
         PRODUCT_NAME: ElementX
         PRODUCT_BUNDLE_IDENTIFIER: io.element.elementx
-        MARKETING_VERSION: 1.0.0
-        CURRENT_PROJECT_VERSION: 1.0.0
+        MARKETING_VERSION: 1.0.1
+        CURRENT_PROJECT_VERSION: 1
         DEVELOPMENT_TEAM: 7J4U792NQT
-        SUPPORTS_MACCATALYST: YES
         CODE_SIGN_ENTITLEMENTS: ElementX/SupportingFiles/ElementX.entitlements 
         SWIFT_OBJC_BRIDGING_HEADER: ElementX/SupportingFiles/ElementX-Bridging-Header.h
         
diff --git a/Gemfile.lock b/Gemfile.lock
index f08e7c081..ad620d00f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,7 +115,7 @@ GEM
     fastlane-plugin-brew (0.1.1)
     fastlane-plugin-diawi (2.1.0)
       rest-client (>= 2.0.0)
-    fastlane-plugin-sentry (1.12.0)
+    fastlane-plugin-sentry (1.12.1)
     fastlane-plugin-xcodegen (1.1.0)
       fastlane-plugin-brew (~> 0.1.1)
     gh_inspector (1.1.3)
@@ -159,7 +159,7 @@ GEM
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.10.0)
@@ -231,7 +231,7 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 865697132..b700b5e19 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -51,7 +51,7 @@ lane :build_and_publish_on_github do
 
   upload_to_diawi()
 
-  mac_adhoc()
+  # mac_adhoc()
 
   release_to_github()
 
@@ -151,7 +151,7 @@ private_lane :release_to_github do
   diawi_app_id = URI(diawi_link).path.split('/').last
   diawi_qr_code_link = "https://www.diawi.com/qrcode/link/#{diawi_app_id}"
 
-  release_version = "v#{get_version_number()}.#{Time.now.strftime("%Y%m%d%H%M")}"
+  release_version = "#{get_version_number()}-#{Time.now.strftime("%Y%m%d%H%M")}"
 
   github_release = set_github_release(
     repository_name: "vector-im/element-x-ios",
@@ -161,7 +161,7 @@ private_lane :release_to_github do
     is_generate_release_notes: true,
     description: "[iOS AdHoc Release - Diawi Link](#{diawi_link})
     ![QR code](#{diawi_qr_code_link})",
-    upload_assets: ["build/ElementX.app.zip"]
+    # upload_assets: ["build/ElementX.app.zip"]
   )
 end