diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-06-27 07:35:32 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-06-27 09:33:52 +0200 |
| commit | 489d806708c3f26bacba084479c870e26451d32e (patch) | |
| tree | 3e385a25db1529ea7dfc9ba7970a923e567b2b1b /android/lib | |
| parent | f511be6302af0f17e1cb1dd3de727938f32c7f01 (diff) | |
| download | mullvadvpn-489d806708c3f26bacba084479c870e26451d32e.tar.xz mullvadvpn-489d806708c3f26bacba084479c870e26451d32e.zip | |
Bump Dependencies to K2
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/map/build.gradle.kts | 11 | ||||
| -rw-r--r-- | android/lib/theme/build.gradle.kts | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts index f4606de5bd..dee6779d8a 100644 --- a/android/lib/map/build.gradle.kts +++ b/android/lib/map/build.gradle.kts @@ -1,32 +1,27 @@ plugins { id(Dependencies.Plugin.kotlinAndroidId) id(Dependencies.Plugin.androidLibraryId) + id(Dependencies.Plugin.composeCompiler) version Versions.kotlin } android { namespace = "net.mullvad.mullvadvpn.lib.map" compileSdk = Versions.Android.compileSdkVersion - defaultConfig { - minSdk = Versions.Android.minSdkVersion - } + defaultConfig { minSdk = Versions.Android.minSdkVersion } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = Versions.jvmTarget - } + kotlinOptions { jvmTarget = Versions.jvmTarget } buildFeatures { compose = true buildConfig = true } - composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion } - lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") abortOnError = true diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts index dbf80a3b98..33f094fba4 100644 --- a/android/lib/theme/build.gradle.kts +++ b/android/lib/theme/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id(Dependencies.Plugin.androidLibraryId) id(Dependencies.Plugin.kotlinAndroidId) + id(Dependencies.Plugin.composeCompiler) version Versions.kotlin } android { @@ -11,8 +12,6 @@ android { buildFeatures { compose = true } - composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion } - compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 |