From 7efa4e23de120459c5547012f81946d9da8bf6f9 Mon Sep 17 00:00:00 2001
From: Christian Maier <christian.maier@snabble.io>
Date: Thu, 8 Feb 2024 15:37:55 +0100
Subject: [PATCH 1/3] Refactor obsolete buildConfig setting from
 gradle.properties

---
 core/build.gradle.kts       | 4 ++++
 gradle.properties           | 1 -
 ui-toolkit/build.gradle.kts | 1 +
 utils/build.gradle.kts      | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index cde76fae0b..d5181531cc 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -54,6 +54,10 @@ android {
         jvmTarget = "17"
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
diff --git a/gradle.properties b/gradle.properties
index b8ac2e97d9..f25c4bb6fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,6 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
diff --git a/ui-toolkit/build.gradle.kts b/ui-toolkit/build.gradle.kts
index c72d67666f..575e361b10 100644
--- a/ui-toolkit/build.gradle.kts
+++ b/ui-toolkit/build.gradle.kts
@@ -58,6 +58,7 @@ android {
     }
 
     buildFeatures {
+        buildConfig = true
         compose = true
     }
 
diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts
index 80a45c8e1d..8bb9399ef3 100644
--- a/utils/build.gradle.kts
+++ b/utils/build.gradle.kts
@@ -51,6 +51,10 @@ android {
         )
         jvmTarget = "17"
     }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

From 76e348c7a84480d8ec9c7bc80ff568bbaab8975a Mon Sep 17 00:00:00 2001
From: Christian Maier <christian.maier@snabble.io>
Date: Thu, 8 Feb 2024 15:42:25 +0100
Subject: [PATCH 2/3] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bb9bec9a0..d2746d6d9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,10 @@ All notable changes to this project will be documented in this file.
 
 ## [0.72.2]
 ### Changed
+* core: Explicitly enable buildConfig (#171)
 * ui: Re-enable Giropay integration (#169)
+* ui-toolkit: Explicitly enable buildConfig (#171)
+* utils: Explicitly enable buildConfig (#171)
 
 ## [0.72.1]
 ### Added

From 3b6a76af9d45ff614ff57a488d798fa8a4dac3ac Mon Sep 17 00:00:00 2001
From: Christian Maier <christian.maier@snabble.io>
Date: Thu, 8 Feb 2024 16:38:00 +0100
Subject: [PATCH 3/3] Add missing builConfig flag to kotlin-sample

---
 CHANGELOG.md                   | 1 +
 kotlin-sample/build.gradle.kts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2746d6d9a..6914cf173d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 ## [0.72.2]
 ### Changed
 * core: Explicitly enable buildConfig (#171)
+* kotlin-sample: Explicitly enable buildConfig (#171)
 * ui: Re-enable Giropay integration (#169)
 * ui-toolkit: Explicitly enable buildConfig (#171)
 * utils: Explicitly enable buildConfig (#171)
diff --git a/kotlin-sample/build.gradle.kts b/kotlin-sample/build.gradle.kts
index 66c4d7ae12..c02c560a44 100644
--- a/kotlin-sample/build.gradle.kts
+++ b/kotlin-sample/build.gradle.kts
@@ -44,6 +44,7 @@ android {
 
 
     buildFeatures {
+        buildConfig = true
         compose = true
     }