Revert "[ios, ci] Use AdHoc entitlements for AdHoc builds"

This reverts commit 8c3bb93.

We previously had to use separate AdHoc entitlements because the default
mail-client entitlement couldn't be included due to the AdHoc
provisioning profile not allowing it, causing the build to fail.

After we contacted Apple, they made it so our AdHoc profiles now allow
the mail-client entitlement, making this change unnecessary.

Author: hrb-hub

app-ios/common.yml

@@ -9,25 +9,18 @@ settingGroups:
       Release Development:
         PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]: "match AdHoc ${bundleIdPrefix}.$(PRODUCT_NAME)"
       Release Staging:
-        # set default to AppStore. Its associated entitlement has default mail app capability.
         # Provisioning profile is used at two stages: archive and export.
         #
         # During archive the app is built and signed. Technically provisioning profile is not embedded at this stage
         # yet but since the app is signed at this step Xcode will check that the provisioning profile has correct
-        # entitlements which could fail because ad-hoc provisioning profiles do not have default mail app capability.
+        # entitlements.
         #
         # During export the provisioning profile will actually be used to package the app. This is the step where
         # Fastlane's match will instruct Xcode to use the right provisioning profile.
-        #
-        # For Ad-Hoc builds we will overwrite the entitlement in Fastfile (update_code_signing_settings). This will
-        # update the xcodeproj file so that the archive can be generated without default mail app entitlement.
-        #
-        # For AppStore builds we do not overwrite the signing config so the values specified here will be applied
-        # during archive step.
-        PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]: "match AppStore $(PRODUCT_BUNDLE_IDENTIFIER)"
+        PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]: "match AdHoc $(PRODUCT_BUNDLE_IDENTIFIER)"
       Release Production:
         CODE_SIGN_ENTITLEMENTS: "$(TARGET_NAME)/$(TARGET_NAME).entitlements"
-        PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]: "match AppStore $(PRODUCT_BUNDLE_IDENTIFIER)"
+        PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]: "match AdHoc $(PRODUCT_BUNDLE_IDENTIFIER)"
   extension:
     base:
       SKIP_INSTALL: "YES"

app-ios/fastlane/Fastfile

@@ -68,15 +68,6 @@ platform :ios do
 
 		clear_derived_data
 
-		# The default mail-client entitlement can't be included in the AdHoc entitlements because the AdHoc provisioning
-		# profile doesn't allow it and will cause the build to fail.
-		update_code_signing_settings(
-			path: "tutanota.xcodeproj",
-			targets: ["tutanota"],
-			entitlements_file_path: "tutanota/tutanotaAdHoc.entitlements",
-			build_configurations: ["Release Production"]
-		)
-
 		ipa_name = "tutanota-" + get_version_number(target: "tutanota", xcodeproj: "tutanota.xcodeproj") + "-adhoc"
 		build_app(
 			scheme: "tuta prod",
@@ -138,15 +129,6 @@ platform :ios do
 
 		clear_derived_data
 
-		# The default mail-client entitlement can't be included in the AdHoc entitlements because the AdHoc provisioning
-		# profile doesn't allow it and will cause the build to fail.
-		update_code_signing_settings(
-			path: "tutanota.xcodeproj",
-			targets: ["tutanota"],
-			entitlements_file_path: "tutanota/tutanotaAdHocStaging.entitlements",
-			build_configurations: ["Release Staging"]
-		)
-
 		build_app(
 			scheme: "tuta staging",
 			output_directory: "releases",

app-ios/tutanota/tutanotaAdHoc.entitlements

@@ -89,15 +89,11 @@ pipeline {
 								buildWebapp("test")
 								generateXCodeProjects()
 								util.runFastlane("de.tutao.tutanota.test", "adhoc_staging")
-								// Fastlane will overwrite code signing settings for adhoc so we regenerate the project
-								// to make sure it is in correct state.
-								generateXCodeProject("app-ios", "mail-project")
-                                util.runFastlane("de.tutao.tutanota.test", "build_mail_staging")
-
 								if (params.UPLOAD) {
+									util.runFastlane("de.tutao.tutanota.test", "build_mail_staging")
 									stash includes: "app-ios/releases/tutanota-${VERSION}-test.ipa", name: 'ipa-staging'
-                                    stash includes: "app-ios/releases/tutanota-${VERSION}-adhoc-test.ipa", name: 'ipa-adhoc-staging'
 								}
+								stash includes: "app-ios/releases/tutanota-${VERSION}-adhoc-test.ipa", name: 'ipa-adhoc-staging'
 							}
 						}
 					}
@@ -118,15 +114,11 @@ pipeline {
 								buildWebapp("prod")
 								generateXCodeProjects()
 								util.runFastlane("de.tutao.tutanota", "adhoc_prod")
-                                // Fastlane will overwrite code signing settings for adhoc so we regenerate the project
-                                // to make sure it is in correct state.
-								generateXCodeProject("app-ios", "mail-project")
-                                util.runFastlane("de.tutao.tutanota", "build_mail_prod")
-
 								if (params.UPLOAD) {
+									util.runFastlane("de.tutao.tutanota", "build_mail_prod")
 									stash includes: "app-ios/releases/tutanota-${VERSION}.ipa", name: 'ipa-production'
-                                    stash includes: "app-ios/releases/tutanota-${VERSION}-adhoc.ipa", name: 'ipa-adhoc-production'
 								}
+								stash includes: "app-ios/releases/tutanota-${VERSION}-adhoc.ipa", name: 'ipa-adhoc-production'
 							}
 						}
 					} // steps