From 70704879772e466c81de804ce60a02896749495d Mon Sep 17 00:00:00 2001 From: meikpiep Date: Sat, 14 Sep 2024 13:27:33 +0200 Subject: [PATCH] Upgrade Java version from 11 to 17 This is needed by the upcoming addition of a dependency to enable scatter plots. Tests with an emulated AOSP device using min API 24 were successful. This is a best guess as to correlation between Android API versions the Java versions is somewhat complicated. --- gauguin-app/build.gradle.kts | 12 ++++++------ gauguin-core/build.gradle.kts | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gauguin-app/build.gradle.kts b/gauguin-app/build.gradle.kts index 247354ea..f6e52c86 100644 --- a/gauguin-app/build.gradle.kts +++ b/gauguin-app/build.gradle.kts @@ -46,8 +46,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } testOptions { @@ -114,17 +114,17 @@ repositories { jcenter() } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(11)) +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) kotlin { jvmToolchain(11) } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/gauguin-core/build.gradle.kts b/gauguin-core/build.gradle.kts index 1255e161..3150066f 100644 --- a/gauguin-core/build.gradle.kts +++ b/gauguin-core/build.gradle.kts @@ -45,17 +45,17 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } }