From b9bc54c56df5ae2e536f663f71b233cbd54f47cd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 10 Mar 2023 20:45:36 -0300
Subject: [PATCH] [app] Fix flavor applicationId setup for debug builds

These were always using the package name of the full flavor.
---
 app/build.gradle | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0a838e522..e2651937b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,7 +65,6 @@ android {
             getIsDefault().set(true)
             manifestPlaceholders = [ applicationLabel: APP_NAME_DEBUG ]
             applicationIdSuffix ".debug"
-            resValue "string", "applicationId", fullApplicationId + applicationIdSuffix
             versionNameSuffix "-debug"
             // testProguardFiles gets partially ignored for instrumentation tests
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'src/androidTest/proguard-rules.pro'
@@ -79,13 +78,27 @@ android {
             getIsDefault().set(true)
             dimension "base"
             applicationId fullApplicationId
-            resValue "string", "applicationId", fullApplicationId
+            buildTypes {
+                release {
+                    resValue "string", "applicationId", fullApplicationId
+                }
+                debug {
+                    resValue "string", "applicationId", fullApplicationId + buildTypes.debug.applicationIdSuffix
+                }
+            }
         }
         basic {
             dimension "base"
             targetSdkVersion 33
             applicationId basicApplicationId
-            resValue "string", "applicationId", basicApplicationId
+            buildTypes {
+                release {
+                    resValue "string", "applicationId", basicApplicationId
+                }
+                debug {
+                    resValue "string", "applicationId", basicApplicationId + buildTypes.debug.applicationIdSuffix
+                }
+            }
         }
     }