Update Gradle to 8.0.2

This commit is contained in:
Michael Bull 2023-04-03 12:16:37 +01:00
parent 41fff9eb9c
commit 8229a29f62
7 changed files with 12 additions and 21 deletions

View File

@ -19,12 +19,9 @@ benchmark {
} }
kotlin { kotlin {
jvmToolchain(8)
jvm { jvm {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
} }
js(IR) { js(IR) {

View File

@ -64,6 +64,8 @@ subprojects {
configure<KotlinMultiplatformExtension> { configure<KotlinMultiplatformExtension> {
explicitApi() explicitApi()
jvmToolchain(8)
jvm { jvm {
mavenPublication { mavenPublication {
artifact(javadocJar.get()) artifact(javadocJar.get())

View File

@ -9,6 +9,10 @@ application {
mainClass.set("com.github.michaelbull.result.example.ApplicationKt") mainClass.set("com.github.michaelbull.result.example.ApplicationKt")
} }
kotlin {
jvmToolchain(8)
}
dependencies { dependencies {
implementation(project(":kotlin-result")) implementation(project(":kotlin-result"))
implementation(libs.kotlin.stdlib.jdk8) implementation(libs.kotlin.stdlib.jdk8)
@ -18,9 +22,3 @@ dependencies {
implementation(libs.ktor.server.content.negotiation) implementation(libs.ktor.server.content.negotiation)
implementation(libs.ktor.server.netty) implementation(libs.ktor.server.netty)
} }
tasks.withType(KotlinCompile::class.java).all {
kotlinOptions {
jvmTarget = "1.8"
}
}

Binary file not shown.

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -6,13 +6,7 @@ plugins {
} }
kotlin { kotlin {
jvm { jvmToolchain(8)
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
// Additional targets not currently supported by coroutines // Additional targets not currently supported by coroutines
androidNativeArm32() androidNativeArm32()