From e35d629a5aedb73ba4be2465b8f81680eafde780 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Thu, 30 May 2024 10:37:04 +0200 Subject: [PATCH] Upgrade to Gradle 8.7. Target JDK 17 --- .../org/openrndr/template/convention/openrndr-jvm.gradle.kts | 4 ++++ gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/openrndr/template/convention/openrndr-jvm.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/template/convention/openrndr-jvm.gradle.kts index cae5cae..3459076 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/template/convention/openrndr-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/template/convention/openrndr-jvm.gradle.kts @@ -18,8 +18,12 @@ plugins { tasks.withType { + kotlinOptions { + jvmTarget = "17" + } compilerOptions { jvmTarget.set(JvmTarget.valueOf("JVM_${libs.versions.jvmTarget.get()}")) + freeCompilerArgs.add("-Xjdk-release=${libs.versions.jvmTarget.get()}") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7f551e7..1df99e6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ kotlin = "2.0.0" openrndr = "0.4.5-SNAPSHOT" orx = "0.4.5-SNAPSHOT" orml = "0.4.1" -jvmTarget = "11" +jvmTarget = "17" slf4j = "2.0.13" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..b82aa23 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-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME