From 402e07e9d8b72f4105e3183bbd1d6db62722fa9b Mon Sep 17 00:00:00 2001 From: nea Date: Thu, 25 May 2023 23:43:38 +0200 Subject: Update gradle to 8.1.1 --- build.gradle.kts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'build.gradle.kts') 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 { 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") -- cgit