Merge branch 'revert-profiles' into 'release/23.2'

Revert profiles

See merge request highlighter/app!254

Highlighter.xcodeproj/project.pbxproj

@@ -3931,7 +3931,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.cocoatype.Highlighter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development com.cocoatype.Highlighter";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match Development com.cocoatype.Highlighter catalyst";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match Development com.cocoatype.Highlighter macos";
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -3962,7 +3962,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.cocoatype.Highlighter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.cocoatype.Highlighter";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore com.cocoatype.Highlighter catalyst";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore com.cocoatype.Highlighter macos";
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";

fastlane/Fastfile

@@ -53,6 +53,13 @@ platform :mac do
 
   desc "Submit a new beta build to Apple TestFlight"
   lane :beta do
+    # We MUST sync codesigning twice. The app must be codesigned with
+    # a macOS provisioning profile; if it is signed with a Catalyst
+    # profile, the embedded Automator action gets an invalid entitlement.
+    #
+    # However, we need the Catalyst profile for the final export, or the
+    # App Store upload will be rejected.
+    sync_code_signing
     sync_code_signing(platform: "catalyst")
 
     # Set the build number to the number of Git commits
@@ -92,6 +99,7 @@ platform :mac do
 
   desc "Set up developer environment"
   lane :dev do
+    sync_code_signing
     sync_code_signing(platform: "catalyst")
   end
 end