From acaa3cf1458b440461b1766a12d7a7b04697f9bd Mon Sep 17 00:00:00 2001 From: JanNiklas Grabowski Date: Thu, 5 Sep 2024 10:22:25 +0000 Subject: [PATCH] feat: use match (MESSENGER-6377) --- Config/AppIdentifiers.xcconfig | 4 ++++ Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig | 4 ++++ Config/BuM-Beta/AppIdentifiers-bum-beta.xcconfig | 4 ++++ Config/BuM-Open/AppIdentifiers-bum-open.xcconfig | 4 ++++ Config/BuM/AppIdentifiers-bum.xcconfig | 4 ++++ Config/Project-Debug.xcconfig | 4 ++-- Config/Project-Release.xcconfig | 2 +- Riot/Debug.xcconfig | 2 ++ Riot/Release.xcconfig | 2 +- Riot/target-messenger.yml | 2 +- RiotNSE/Debug.xcconfig | 3 +++ RiotNSE/Release.xcconfig | 4 ++-- 12 files changed, 32 insertions(+), 7 deletions(-) diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig index 9ca3afc7d..ba5769e39 100644 --- a/Config/AppIdentifiers.xcconfig +++ b/Config/AppIdentifiers.xcconfig @@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-beta APPLICATION_GROUP_IDENTIFIER = group.de.messenger-beta APPLICATION_SCHEME = BuM +// NSE +NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.messenger-beta.nse +NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.messenger-beta.nse + // Team DEVELOPMENT_TEAM = Q111Q11QQ1 diff --git a/Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig b/Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig index a7ed5d9fc..398cc950c 100644 --- a/Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig +++ b/Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig @@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.bwmessenger.mdm APPLICATION_GROUP_IDENTIFIER = group.de.bwmessenger.mdm APPLICATION_SCHEME = BuM4BWI +// NSE +NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.bwmessenger.mdm.nse +NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.bwmessenger.mdm.nse + // Team DEVELOPMENT_TEAM = Q111Q11QQ1 diff --git a/Config/BuM-Beta/AppIdentifiers-bum-beta.xcconfig b/Config/BuM-Beta/AppIdentifiers-bum-beta.xcconfig index 3f9e12e34..cd5ef9fdb 100644 --- a/Config/BuM-Beta/AppIdentifiers-bum-beta.xcconfig +++ b/Config/BuM-Beta/AppIdentifiers-bum-beta.xcconfig @@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-beta APPLICATION_GROUP_IDENTIFIER = group.de.messenger-beta APPLICATION_SCHEME = BuM-Beta +// NSE +NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.messenger-beta.nse +NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.messenger-beta.nse + // Team DEVELOPMENT_TEAM = Q111Q11QQ1 diff --git a/Config/BuM-Open/AppIdentifiers-bum-open.xcconfig b/Config/BuM-Open/AppIdentifiers-bum-open.xcconfig index ea9e15a31..282b99572 100644 --- a/Config/BuM-Open/AppIdentifiers-bum-open.xcconfig +++ b/Config/BuM-Open/AppIdentifiers-bum-open.xcconfig @@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-open APPLICATION_GROUP_IDENTIFIER = group.de.messenger-open APPLICATION_SCHEME = BuM +// NSE +NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.messenger-open.nse +NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.messenger-open.nse + // Team DEVELOPMENT_TEAM = Q111Q11QQ1 diff --git a/Config/BuM/AppIdentifiers-bum.xcconfig b/Config/BuM/AppIdentifiers-bum.xcconfig index 8ac272447..cdedc556e 100644 --- a/Config/BuM/AppIdentifiers-bum.xcconfig +++ b/Config/BuM/AppIdentifiers-bum.xcconfig @@ -21,6 +21,10 @@ BASE_BUNDLE_IDENTIFIER = de.bwi.messenger APPLICATION_GROUP_IDENTIFIER = group.de.messenger APPLICATION_SCHEME = BuM +// NSE +NSE_PROVISIONING_PROFILE_SPECIFIER_DEV = match Development de.bwi.messenger.nse +NSE_PROVISIONING_PROFILE_SPECIFIER_STORE = match AppStore de.bwi.messenger.nse + // Team DEVELOPMENT_TEAM = Q111Q11QQ1 diff --git a/Config/Project-Debug.xcconfig b/Config/Project-Debug.xcconfig index 8f6979983..ed130c6e9 100644 --- a/Config/Project-Debug.xcconfig +++ b/Config/Project-Debug.xcconfig @@ -35,5 +35,5 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO // Code signing: Use the development team for all targets -CODE_SIGN_IDENTITY = iPhone Developer -CODE_SIGN_STYLE = Automatic +CODE_SIGN_IDENTITY = Apple Development: App Dev (8WZM4UQ4LX) +CODE_SIGN_STYLE = Manual diff --git a/Config/Project-Release.xcconfig b/Config/Project-Release.xcconfig index c9e52dd72..0ca35f1d8 100644 --- a/Config/Project-Release.xcconfig +++ b/Config/Project-Release.xcconfig @@ -29,5 +29,5 @@ SWIFT_COMPILATION_MODE = wholemodule // Code signing: Manual -CODE_SIGN_IDENTITY = iPhone Distribution +CODE_SIGN_IDENTITY = Apple Distribution: BWI GmbH (Q111Q11QQ1) CODE_SIGN_STYLE = Manual diff --git a/Riot/Debug.xcconfig b/Riot/Debug.xcconfig index 247b53040..fa3162c07 100644 --- a/Riot/Debug.xcconfig +++ b/Riot/Debug.xcconfig @@ -19,3 +19,5 @@ #include "Common.xcconfig" #include "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.debug.xcconfig" + +PROVISIONING_PROFILE_SPECIFIER = match Development $(BASE_BUNDLE_IDENTIFIER) diff --git a/Riot/Release.xcconfig b/Riot/Release.xcconfig index 530cdc1f4..d0b601017 100644 --- a/Riot/Release.xcconfig +++ b/Riot/Release.xcconfig @@ -21,4 +21,4 @@ #include "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.release.xcconfig" PROVISIONING_PROFILE = $(RIOT_PROVISIONING_PROFILE) -PROVISIONING_PROFILE_SPECIFIER = $(RIOT_PROVISIONING_PROFILE_SPECIFIER) \ No newline at end of file +PROVISIONING_PROFILE_SPECIFIER = match AppStore $(BASE_BUNDLE_IDENTIFIER) diff --git a/Riot/target-messenger.yml b/Riot/target-messenger.yml index f18ce440d..30ca62e90 100644 --- a/Riot/target-messenger.yml +++ b/Riot/target-messenger.yml @@ -41,7 +41,7 @@ targets: configFiles: Debug: Debug.xcconfig Release: Release.xcconfig - + preBuildScripts: - name: ⚠️ SwiftLint runOnlyWhenInstalling: false diff --git a/RiotNSE/Debug.xcconfig b/RiotNSE/Debug.xcconfig index 14c7cfc66..c92493953 100644 --- a/RiotNSE/Debug.xcconfig +++ b/RiotNSE/Debug.xcconfig @@ -19,3 +19,6 @@ #include "Common.xcconfig" #include "Pods/Target Support Files/Pods-RiotPods-RiotNSE/Pods-RiotPods-RiotNSE.debug.xcconfig" + +// PROVISIONING_PROFILE = $(NSE_PROVISIONING_PROFILE) +PROVISIONING_PROFILE_SPECIFIER = $(NSE_PROVISIONING_PROFILE_SPECIFIER_DEV) diff --git a/RiotNSE/Release.xcconfig b/RiotNSE/Release.xcconfig index c91ad51e1..5475e84ed 100644 --- a/RiotNSE/Release.xcconfig +++ b/RiotNSE/Release.xcconfig @@ -20,7 +20,7 @@ #include "Common.xcconfig" #include "Pods/Target Support Files/Pods-RiotPods-RiotNSE/Pods-RiotPods-RiotNSE.release.xcconfig" -PROVISIONING_PROFILE = $(NSE_PROVISIONING_PROFILE) -PROVISIONING_PROFILE_SPECIFIER = $(NSE_PROVISIONING_PROFILE_SPECIFIER) +// PROVISIONING_PROFILE = $(NSE_PROVISIONING_PROFILE) +PROVISIONING_PROFILE_SPECIFIER = $(NSE_PROVISIONING_PROFILE_SPECIFIER_STORE) COPY_PHASE_STRIP = NO