diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-07-03 09:34:41 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-07-03 10:18:59 +0200 |
| commit | c65a73d6b996f8933d3e6a9e53ef5c43de96c164 (patch) | |
| tree | 73c0d83b71e55acb4173f16aa952ee38d1912ff7 /android/test | |
| parent | fc8cfd4a31d10ac8c852ce5e485179c168bcdc57 (diff) | |
| download | mullvadvpn-c65a73d6b996f8933d3e6a9e53ef5c43de96c164.tar.xz mullvadvpn-c65a73d6b996f8933d3e6a9e53ef5c43de96c164.zip | |
Fix gradle kotlinOptions warnings
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/arch/build.gradle.kts | 10 | ||||
| -rw-r--r-- | android/test/common/build.gradle.kts | 10 | ||||
| -rw-r--r-- | android/test/e2e/build.gradle.kts | 9 | ||||
| -rw-r--r-- | android/test/mockapi/build.gradle.kts | 10 |
4 files changed, 27 insertions, 12 deletions
diff --git a/android/test/arch/build.gradle.kts b/android/test/arch/build.gradle.kts index 11503955d7..68997325a6 100644 --- a/android/test/arch/build.gradle.kts +++ b/android/test/arch/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -16,9 +18,11 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = libs.versions.jvm.target.get() - allWarningsAsErrors = true + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get()) + allWarningsAsErrors = true + } } lint { diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts index 0a089017af..c3939ffc39 100644 --- a/android/test/common/build.gradle.kts +++ b/android/test/common/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -16,9 +18,11 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = libs.versions.jvm.target.get() - allWarningsAsErrors = true + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get()) + allWarningsAsErrors = true + } } lint { diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts index c68d1c89aa..d678add1b0 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -1,4 +1,5 @@ import org.gradle.internal.extensions.stdlib.capitalized +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.test) @@ -63,9 +64,11 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = libs.versions.jvm.target.get() - allWarningsAsErrors = true + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get()) + allWarningsAsErrors = true + } } lint { diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts index 2a96d32028..aa89e0b011 100644 --- a/android/test/mockapi/build.gradle.kts +++ b/android/test/mockapi/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.test) alias(libs.plugins.kotlin.android) @@ -37,9 +39,11 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = libs.versions.jvm.target.get() - allWarningsAsErrors = true + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get()) + allWarningsAsErrors = true + } } lint { |