From 41dc6d9683a0bf9d883c2be734d08d721722963b Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Thu, 31 Oct 2024 20:54:19 +0100 Subject: Bump Java to 17 11 is really old by now. --- buildSrc/build.gradle.kts | 5 ++--- buildSrc/src/main/groovy/the_jk.android-conventions.gradle | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'buildSrc') diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b3d40ac..d9b13fe 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,11 +15,10 @@ dependencies { java { toolchain { - // 11 needed for compile the groovy - languageVersion = JavaLanguageVersion.of(11) + languageVersion = JavaLanguageVersion.of(17) } } kotlin { - jvmToolchain(11) + jvmToolchain(17) } diff --git a/buildSrc/src/main/groovy/the_jk.android-conventions.gradle b/buildSrc/src/main/groovy/the_jk.android-conventions.gradle index d14761f..e8f42ba 100644 --- a/buildSrc/src/main/groovy/the_jk.android-conventions.gradle +++ b/buildSrc/src/main/groovy/the_jk.android-conventions.gradle @@ -15,11 +15,11 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } testOptions { @@ -60,11 +60,11 @@ def detektPlugin = project.plugins['io.gitlab.arturbosch.detekt'] def detektCls = Class.forName('io.gitlab.arturbosch.detekt.Detekt', true, detektPlugin.class.classLoader) tasks.withType(detektCls).configureEach { - jvmTarget = "11" + jvmTarget = "17" } def detektCreateBaselineTaskCls = Class.forName('io.gitlab.arturbosch.detekt.DetektCreateBaselineTask', true, detektPlugin.class.classLoader) tasks.withType(detektCreateBaselineTaskCls).configureEach { - jvmTarget = "11" + jvmTarget = "17" } -- cgit v1.2.3-70-g09d2