diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index f691e13..228941b 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -19,12 +19,9 @@ benchmark { } kotlin { + jvmToolchain(8) + jvm { - compilations.all { - kotlinOptions { - jvmTarget = "1.8" - } - } } js(IR) { diff --git a/build.gradle.kts b/build.gradle.kts index b9119cf..19b4327 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,6 +64,8 @@ subprojects { configure { explicitApi() + jvmToolchain(8) + jvm { mavenPublication { artifact(javadocJar.get()) diff --git a/example/build.gradle.kts b/example/build.gradle.kts index f04cf2b..9cce8bd 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -9,6 +9,10 @@ application { mainClass.set("com.github.michaelbull.result.example.ApplicationKt") } +kotlin { + jvmToolchain(8) +} + dependencies { implementation(project(":kotlin-result")) implementation(libs.kotlin.stdlib.jdk8) @@ -18,9 +22,3 @@ dependencies { implementation(libs.ktor.server.content.negotiation) implementation(libs.ktor.server.netty) } - -tasks.withType(KotlinCompile::class.java).all { - kotlinOptions { - jvmTarget = "1.8" - } -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..ccebba7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b22d05..761b8f0 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.0.2-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..79a61d4 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/kotlin-result/build.gradle.kts b/kotlin-result/build.gradle.kts index e9e5ed9..0850a1b 100644 --- a/kotlin-result/build.gradle.kts +++ b/kotlin-result/build.gradle.kts @@ -6,13 +6,7 @@ plugins { } kotlin { - jvm { - compilations.all { - kotlinOptions { - jvmTarget = "1.8" - } - } - } + jvmToolchain(8) // Additional targets not currently supported by coroutines androidNativeArm32()