diff options
| author | David Göransson <david.goransson90@gmail.com> | 2024-03-01 15:30:06 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-03-04 12:14:05 +0100 |
| commit | 832faec0b804db18b08c993541cf00316067eadd (patch) | |
| tree | aa62f1cd8c305c71ba041102e2ba1261daf14d74 /android | |
| parent | f9267d998e086d4b324d4c7d9998e5d9ff60ca8a (diff) | |
| download | mullvadvpn-832faec0b804db18b08c993541cf00316067eadd.tar.xz mullvadvpn-832faec0b804db18b08c993541cf00316067eadd.zip | |
Remove buildconfig from properties
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 5 | ||||
| -rw-r--r-- | android/gradle.properties | 1 | ||||
| -rw-r--r-- | android/lib/endpoint/build.gradle.kts | 3 | ||||
| -rw-r--r-- | android/lib/map/build.gradle.kts | 5 | ||||
| -rw-r--r-- | android/service/build.gradle.kts | 3 | ||||
| -rw-r--r-- | android/test/e2e/build.gradle.kts | 3 |
6 files changed, 17 insertions, 3 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 9d9678c242..c4be0bcc43 100644 --- 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 index 6ee1f9ff67..912e0912ff 100644 --- 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 index f46c70c7d7..0bf140b743 100644 --- 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 index 75d11ae189..7ca04c16da 100644 --- 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 index ebf48d22fd..73daa9bcb0 100644 --- 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 index 8440967aa9..7d9a78cda6 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -97,6 +97,9 @@ android { ) } } + buildFeatures { + buildConfig = true + } } androidComponents { |