chore: merge and update to java 21

This commit is contained in:
2023-12-28 21:41:39 +08:00
parent fcdf0b9f89
commit 14ddd6978c
2 changed files with 11 additions and 16 deletions

View File

@@ -1,16 +1,4 @@
plugins { plugins {
autowire(libs.plugins.kotlin.jvm) apply false autowire(libs.plugins.kotlin.jvm) apply false
} autowire(libs.plugins.maven.publish) apply false
allprojects {
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = "17"
freeCompilerArgs = listOf(
"-Xno-param-assertions",
"-Xno-call-assertions",
"-Xno-receiver-assertions"
)
}
}
} }

View File

@@ -8,14 +8,21 @@ group = property.project.groupName
version = property.project.version version = property.project.version
java { java {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_21
withSourcesJar() withSourcesJar()
} }
kotlin { kotlin {
jvmToolchain(17) jvmToolchain(21)
sourceSets.all { languageSettings { languageVersion = "2.0" } } sourceSets.all { languageSettings { languageVersion = "2.0" } }
compilerOptions {
freeCompilerArgs = listOf(
"-Xno-param-assertions",
"-Xno-call-assertions",
"-Xno-receiver-assertions"
)
}
} }
dependencies { dependencies {