From 8ea19468e786816d7ec35f5b4737bf535f3b0cc5 Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Thu, 4 Apr 2024 09:13:43 -0700 Subject: [PATCH 1/2] fix: android workflow variables --- packages/scripts/src/tasks/providers/android.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/scripts/src/tasks/providers/android.ts b/packages/scripts/src/tasks/providers/android.ts index 4f410d210f..2fb9a5bfc9 100644 --- a/packages/scripts/src/tasks/providers/android.ts +++ b/packages/scripts/src/tasks/providers/android.ts @@ -43,8 +43,9 @@ const configure = async ({ appId, appName, versionName }: IAndroidBuildOptions) VERSION_CODE: versionCode, VERSION_NAME: versionName, }, - // do not overwrite ${applicationId} variable in AndroidManifest template - excludeVariables: ["applicationId"], + // Only replace the following variables + includeVariables: ["APP_ID", "APP_NAME", "VERSION_CODE", "VERSION_NAME"], + // excludeVariables: ["applicationId"], }); // Move files where template not already located in correct folder (various reasons below) From ba7f7f6c27ceda7bfecd2178bfa24ae517e56b5a Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Thu, 4 Apr 2024 09:15:22 -0700 Subject: [PATCH 2/2] chore: code tidying --- packages/scripts/src/tasks/providers/android.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/scripts/src/tasks/providers/android.ts b/packages/scripts/src/tasks/providers/android.ts index 2fb9a5bfc9..dfb8d56842 100644 --- a/packages/scripts/src/tasks/providers/android.ts +++ b/packages/scripts/src/tasks/providers/android.ts @@ -45,7 +45,6 @@ const configure = async ({ appId, appName, versionName }: IAndroidBuildOptions) }, // Only replace the following variables includeVariables: ["APP_ID", "APP_NAME", "VERSION_CODE", "VERSION_NAME"], - // excludeVariables: ["applicationId"], }); // Move files where template not already located in correct folder (various reasons below)