diff options
| -rw-r--r-- | build.gradle.kts | 32 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index ffe94fd..c6d5387 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,4 @@ import moe.nea.licenseextractificator.LicenseDiscoveryTask -import org.apache.commons.lang3.time.CalendarUtils import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -13,6 +12,22 @@ plugins { id("io.github.juuxel.loom-quiltflower") version "1.7.3" } +java { + withSourcesJar() + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + +val compileKotlin: KotlinCompile by tasks +compileKotlin.kotlinOptions { + jvmTarget = "17" +} +val compileTestKotlin: KotlinCompile by tasks +compileTestKotlin.kotlinOptions { + jvmTarget = "17" +} + loom { clientOnlyMinecraftJar() accessWidenerPath.set(project.file("src/main/resources/firmament.accesswidener")) @@ -101,21 +116,6 @@ tasks.withType<JavaCompile> { options.release.set(17) } -java { - withSourcesJar() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - -// could not set to 17, up to 16 -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = "16" -} -val compileTestKotlin: KotlinCompile by tasks -compileTestKotlin.kotlinOptions { - jvmTarget = "16" -} - tasks.shadowJar { configurations = listOf(shadowMe) archiveClassifier.set("dev-thicc") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..fae0804 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |