From ae8e6cea14dc75ab79ef3cfa92d5bff65014d370 Mon Sep 17 00:00:00 2001 From: Dmitry Kandalov Date: Tue, 28 May 2024 15:21:39 +0100 Subject: [PATCH] gradle 8.7, jdk 21 --- build.gradle.kts | 11 +++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a1f21bf..2e2b74b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { kotlin("jvm") version "2.0.0" } @@ -14,9 +12,6 @@ dependencies { testImplementation("junit:junit:4.13.2") } -tasks.withType().configureEach { - kotlinOptions.jvmTarget = "17" - kotlinOptions.freeCompilerArgs = listOf( - "-Xstring-concat=indy-with-constants", // See https://kotlinlang.org/docs/whatsnew1420.html#invokedynamic-string-concatenation - ) -} \ No newline at end of file +kotlin { + jvmToolchain(21) +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b22d05..bb6c191 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists