From 66edbd9503624a78d0c728b3a90bf1213295ec01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Wed, 18 Sep 2024 23:47:04 +0200 Subject: [PATCH 1/3] Update bundleIdentifier.ts --- packages/eas-cli/src/project/ios/bundleIdentifier.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/eas-cli/src/project/ios/bundleIdentifier.ts b/packages/eas-cli/src/project/ios/bundleIdentifier.ts index 91c4110281..07b4108e5c 100644 --- a/packages/eas-cli/src/project/ios/bundleIdentifier.ts +++ b/packages/eas-cli/src/project/ios/bundleIdentifier.ts @@ -59,14 +59,15 @@ export async function getBundleIdentifierAsync( vcsClient: Client, xcodeContext?: { targetName?: string; buildConfiguration?: string } ): Promise { + if (env.overrideIosBundleIdentifier) { + return env.overrideIosBundleIdentifier; + } + const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient); + if (workflow === Workflow.GENERIC) { warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp); - if (env.overrideIosBundleIdentifier) { - return env.overrideIosBundleIdentifier; - } - const xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir); const isMultiScheme = IOSConfig.BuildScheme.getSchemesFromXcodeproj(projectDir).length > 1; const isMultiTarget = From 805027ead1daec534361fc0e2b7ac2023a8828ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Thu, 19 Sep 2024 15:44:08 +0200 Subject: [PATCH 2/3] Same for Android --- packages/eas-cli/src/project/android/applicationId.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/eas-cli/src/project/android/applicationId.ts b/packages/eas-cli/src/project/android/applicationId.ts index 6cecb7dd44..f1039cdf9d 100644 --- a/packages/eas-cli/src/project/android/applicationId.ts +++ b/packages/eas-cli/src/project/android/applicationId.ts @@ -65,9 +65,6 @@ export async function getApplicationIdFromBareAsync( projectDir: string, gradleContext?: GradleBuildContext ): Promise { - if (env.overrideAndroidApplicationId) { - return env.overrideAndroidApplicationId; - } const errorMessage = 'Could not read applicationId from Android project.'; if (gradleContext) { @@ -109,6 +106,10 @@ export async function getApplicationIdAsync( vcsClient: Client, gradleContext?: GradleBuildContext ): Promise { + if (env.overrideAndroidApplicationId) { + return env.overrideAndroidApplicationId; + } + const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient); if (workflow === Workflow.GENERIC) { warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp); From 9695bcdf64bf5eb1f164b6f757a46cad19aadb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Thu, 19 Sep 2024 15:49:12 +0200 Subject: [PATCH 3/3] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e32bb4f456..90f81b527d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This is the log of notable changes to EAS CLI and related packages. - Log command execution to assist in debugging local builds. ([#2526](https://github.com/expo/eas-cli/pull/2526) by [@trajano](https://github.com/trajano)) - Allow submitting builds in progress ([#2543](https://github.com/expo/eas-cli/pull/2543) by [@radoslawkrzemien](https://github.com/radoslawkrzemien)) +- Use `EAS_DANGEROUS_OVERRIDE_ANDROID_APPLICATION_ID` and `EAS_DANGEROUS_OVERRIDE_IOS_BUNDLE_IDENTIFIER` environment variables as overrides of the Android application ID and iOS bundle identifier in managed workflow too. ([#2576](https://github.com/expo/eas-cli/pull/2576) by [@sjchmiela](https://github.com/sjchmiela)) ### 🐛 Bug fixes