summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2026-01-14 18:53:37 +0100
committerGitHub <noreply@github.com>2026-01-14 18:53:37 +0100
commita80734138e88267d142eac4891ecd01e9e644df4 (patch)
treef229d2b6bb5796b2297d660782e016051e860673 /Source/Android
parent2aee998a8eaee2ad66e37c7f73c8a1f7511241de (diff)
parentaf0d03b399d4d23152e713585a75b4880ec925d8 (diff)
Merge pull request #14244 from LeddaZ/kotlin-compilerdsl
Android: Use compilerOptions block to specify JVM version
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/app/build.gradle.kts8
-rw-r--r--Source/Android/benchmark/build.gradle.kts7
2 files changed, 11 insertions, 4 deletions
diff --git a/Source/Android/app/build.gradle.kts b/Source/Android/app/build.gradle.kts
index 2beaad2551..64d909423c 100644
--- a/Source/Android/app/build.gradle.kts
+++ b/Source/Android/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
@@ -23,8 +25,10 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}
- kotlinOptions {
- jvmTarget = "17"
+ kotlin {
+ compilerOptions {
+ jvmTarget = JvmTarget.fromTarget("17")
+ }
}
lint {
diff --git a/Source/Android/benchmark/build.gradle.kts b/Source/Android/benchmark/build.gradle.kts
index 06267c42e5..242aff8f86 100644
--- a/Source/Android/benchmark/build.gradle.kts
+++ b/Source/Android/benchmark/build.gradle.kts
@@ -1,4 +1,5 @@
import com.android.build.api.dsl.ManagedVirtualDevice
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
id("com.android.test")
@@ -15,8 +16,10 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}
- kotlinOptions {
- jvmTarget = "17"
+ kotlin {
+ compilerOptions {
+ jvmTarget = JvmTarget.fromTarget("17")
+ }
}
defaultConfig {