mirror of
https://github.com/tursom/TursomServer.git
synced 2025-02-05 01:00:21 +08:00
update java version to 21, kotlin version to 1.9.22
This commit is contained in:
parent
fc31966b5c
commit
a9dc94051d
@ -1,7 +1,7 @@
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
plugins {
|
||||
val kotlinVersion = "1.9.20-RC2"
|
||||
val kotlinVersion = "1.9.22"
|
||||
kotlin("jvm") version kotlinVersion
|
||||
kotlin("plugin.allopen") version kotlinVersion apply false
|
||||
|
||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
import java.util.*
|
||||
|
||||
plugins {
|
||||
kotlin("jvm") version "1.9.10" apply false
|
||||
kotlin("jvm") version "1.9.22" apply false
|
||||
`java-gradle-plugin`
|
||||
}
|
||||
|
||||
@ -49,21 +49,21 @@ allprojects {
|
||||
from(components["java"])
|
||||
try {
|
||||
artifact(tasks["kotlinSourcesJar"])
|
||||
} catch (e: Exception) {
|
||||
} catch (_: Exception) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile>().configureEach {
|
||||
kotlinOptions.jvmTarget = "17"
|
||||
kotlinOptions.jvmTarget = "21"
|
||||
kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
|
||||
//kotlinOptions.useIR = true
|
||||
}
|
||||
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion.set(JavaLanguageVersion.of(17))
|
||||
languageVersion.set(JavaLanguageVersion.of(21))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -133,4 +133,9 @@ fun registerPublishRepos(repositoryHandler: RepositoryHandler, project: Project)
|
||||
println("cannot push to repository $repositoryName")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val publishTask = tasks.getByName("publish")
|
||||
subprojects.forEach {
|
||||
publishTask.dependsOn(it.tasks.getByName("publish").path)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user