Merge branch 'fix-migrate-buildconfig-warning-droid-652'

mullvad · Mar 4, 2024 · 75c0537 · 75c0537
2 parents f9267d9 + 832faec
commit 75c0537
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -122,7 +122,10 @@ android {
         }
     }
 
-    buildFeatures { compose = true }
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
 
     composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion }
 

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,5 +1,4 @@
 android.enableR8.fullMode=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.useAndroidX=true
 kotlin.code.style=official

diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts
@@ -22,6 +22,9 @@ android {
         abortOnError = true
         warningsAsErrors = true
     }
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies { implementation(Dependencies.Kotlin.stdlib) }
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts
@@ -20,7 +20,10 @@ android {
         jvmTarget = Versions.jvmTarget
     }
 
-    buildFeatures { compose = true }
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
 
     composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion }
 

diff --git a/android/service/build.gradle.kts b/android/service/build.gradle.kts
@@ -44,6 +44,9 @@ android {
             buildConfigField("String", "API_ENDPOINT", "\"api.stagemole.eu\"")
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
@@ -97,6 +97,9 @@ android {
                 )
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 androidComponents {
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,6 +97,9 @@ android { @@
                     )
             }
         }
+        buildFeatures {
+            buildConfig = true
+        }
     }
     androidComponents {
@@ Expand Down @@