From c41f1f3b2eb07af174d74a39c38cee14fb879256 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 4 Jun 2024 22:02:46 -0700 Subject: [PATCH] Bumped Gradle to version 8.8 --- .../gradle/java/gradle/wrapper/gradle-wrapper.properties | 2 +- examples/gradle/java/gradlew | 2 +- examples/gradle/kotlin/build.gradle.kts | 6 ++---- .../gradle/kotlin/gradle/wrapper/gradle-wrapper.properties | 2 +- examples/gradle/kotlin/gradlew | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 100644 --- a/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/examples/gradle/java/gradlew b/examples/gradle/java/gradlew index 1aa94a4..b740cf1 100755 --- a/examples/gradle/java/gradlew +++ b/examples/gradle/java/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/examples/gradle/kotlin/build.gradle.kts b/examples/gradle/kotlin/build.gradle.kts index 5e40908..cacd3b1 100644 --- a/examples/gradle/kotlin/build.gradle.kts +++ b/examples/gradle/kotlin/build.gradle.kts @@ -26,8 +26,6 @@ application { mainClass.set("net.thauvin.erik.pinboard.samples.KotlinExampleKt") } -tasks { - withType().configureEach { - kotlinOptions.jvmTarget = java.targetCompatibility.toString() - } +kotlin { + compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } diff --git a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 100644 --- a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/examples/gradle/kotlin/gradlew b/examples/gradle/kotlin/gradlew index 1aa94a4..b740cf1 100755 --- a/examples/gradle/kotlin/gradlew +++ b/examples/gradle/kotlin/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/.