aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornea <nea@nea.moe>2023-05-25 23:43:38 +0200
committernea <nea@nea.moe>2023-05-25 23:43:53 +0200
commit402e07e9d8b72f4105e3183bbd1d6db62722fa9b (patch)
tree94e669728206e5b63394fc54205ceb738f0695df
parentee765a46475d907838697e78968b56155c69da03 (diff)
downloadfirmament-402e07e9d8b72f4105e3183bbd1d6db62722fa9b.tar.gz
firmament-402e07e9d8b72f4105e3183bbd1d6db62722fa9b.tar.bz2
firmament-402e07e9d8b72f4105e3183bbd1d6db62722fa9b.zip
Update gradle to 8.1.1
-rw-r--r--build.gradle.kts32
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
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