From 020ba00bcffaf93ed92be4a254f41afaab68c415 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@element.io>
Date: Fri, 28 Mar 2025 16:54:16 +0100
Subject: [PATCH] Use handy buildConfigFieldStr. (#4501)

---
 app/build.gradle.kts                | 13 ++++++------
 features/call/impl/build.gradle.kts | 31 ++++++++++-------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7984675391..107f9431f2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -20,6 +20,7 @@ import extension.allEnterpriseImpl
 import extension.allFeaturesImpl
 import extension.allLibrariesImpl
 import extension.allServicesImpl
+import extension.buildConfigFieldStr
 import extension.koverDependencies
 import extension.locales
 import extension.setupAnvil
@@ -170,13 +171,13 @@ android {
         create("gplay") {
             dimension = "store"
             isDefault = true
-            buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"")
-            buildConfigField("String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"")
+            buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "G")
+            buildConfigFieldStr("FLAVOR_DESCRIPTION", "GooglePlay")
         }
         create("fdroid") {
             dimension = "store"
-            buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"")
-            buildConfigField("String", "FLAVOR_DESCRIPTION", "\"FDroid\"")
+            buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "F")
+            buildConfigFieldStr("FLAVOR_DESCRIPTION", "FDroid")
         }
     }
 }
@@ -291,8 +292,8 @@ tasks.withType<GenerateBuildConfig>().configureEach {
     outputs.upToDateWhen { false }
     val gitRevision = providers.of(GitRevisionValueSource::class.java) {}.get()
     val gitBranchName = providers.of(GitBranchNameValueSource::class.java) {}.get()
-    android.defaultConfig.buildConfigField("String", "GIT_REVISION", "\"$gitRevision\"")
-    android.defaultConfig.buildConfigField("String", "GIT_BRANCH_NAME", "\"$gitBranchName\"")
+    android.defaultConfig.buildConfigFieldStr("GIT_REVISION", gitRevision)
+    android.defaultConfig.buildConfigFieldStr("GIT_BRANCH_NAME", gitBranchName)
 }
 
 licensee {
diff --git a/features/call/impl/build.gradle.kts b/features/call/impl/build.gradle.kts
index be332ec4fe..f0a9eedca0 100644
--- a/features/call/impl/build.gradle.kts
+++ b/features/call/impl/build.gradle.kts
@@ -1,3 +1,4 @@
+import extension.buildConfigFieldStr
 import extension.readLocalProperty
 import extension.setupAnvil
 
@@ -26,45 +27,35 @@ android {
     }
 
     defaultConfig {
-        buildConfigField(
-            type = "String",
+        buildConfigFieldStr(
             name = "SENTRY_DSN",
-            value = (System.getenv("ELEMENT_CALL_SENTRY_DSN")
+            value = System.getenv("ELEMENT_CALL_SENTRY_DSN")
                 ?: readLocalProperty("features.call.sentry.dsn")
                 ?: ""
-                ).let { "\"$it\"" }
         )
-        buildConfigField(
-            type = "String",
+        buildConfigFieldStr(
             name = "POSTHOG_USER_ID",
-            value = (System.getenv("ELEMENT_CALL_POSTHOG_USER_ID")
+            value = System.getenv("ELEMENT_CALL_POSTHOG_USER_ID")
                 ?: readLocalProperty("features.call.posthog.userid")
                 ?: ""
-                ).let { "\"$it\"" }
         )
-        buildConfigField(
-            type = "String",
+        buildConfigFieldStr(
             name = "POSTHOG_API_HOST",
-            value = (System.getenv("ELEMENT_CALL_POSTHOG_API_HOST")
+            value = System.getenv("ELEMENT_CALL_POSTHOG_API_HOST")
                 ?: readLocalProperty("features.call.posthog.api.host")
                 ?: ""
-                ).let { "\"$it\"" }
         )
-        buildConfigField(
-            type = "String",
+        buildConfigFieldStr(
             name = "POSTHOG_API_KEY",
-            value = (System.getenv("ELEMENT_CALL_POSTHOG_API_KEY")
+            value = System.getenv("ELEMENT_CALL_POSTHOG_API_KEY")
                 ?: readLocalProperty("features.call.posthog.api.key")
                 ?: ""
-                ).let { "\"$it\"" }
         )
-        buildConfigField(
-            type = "String",
+        buildConfigFieldStr(
             name = "RAGESHAKE_URL",
-            value = (System.getenv("ELEMENT_CALL_RAGESHAKE_URL")
+            value = System.getenv("ELEMENT_CALL_RAGESHAKE_URL")
                 ?: readLocalProperty("features.call.regeshake.url")
                 ?: ""
-                ).let { "\"$it\"" }
         )
     }
 }