Update to 6.6.2

Author: duplexsystem

.github/workflows/gradle.yml

@@ -7,16 +7,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - name: Set up JDK 17
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
+      - uses: actions/checkout@v4.2.2
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4.7.1
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
 
-      - uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
+      - uses: burrunan/gradle-cache-action@v3.0.1
         name: Build BiomeTool
         with:
           # Specifies arguments for Gradle execution
@@ -37,8 +37,11 @@ jobs:
             kotlin.parallel.tasks.in.project=true
 
       - name: Release
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
+        uses: softprops/action-gh-release@v2.2.2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            build/libs/BiomeTool-*-all.jar
+            build/libs/BiomeTool-*-all.jar
+            build/libs/BiomeTool-*-linux.jar
+            build/libs/BiomeTool-*-osx.jar
+            build/libs/BiomeTool-*-win.jar

README.md

@@ -27,7 +27,7 @@ All of these files bundle the required javafx libraries, so you can run them wit
 
 Note: You **must** be using Java 17. It will not work with earlier versions.
 
-Use Java 17
+Use Java 21
 
 ## Screenshots
 

build.gradle.kts

@@ -1,21 +1,20 @@
 import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URL
 
 plugins {
     application
-    kotlin("jvm") version "1.9.21"
+    kotlin("jvm") version "2.1.21"
     id("org.openjfx.javafxplugin") version "0.1.0"
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "8.3.6"
 }
 
 var mainClassName: String by application.mainClass
 mainClassName = "com.dfsek.terra.biometool.BiomeToolLauncher"
 
 group = "com.dfsek"
-version = "0.4.8"
+version = "0.4.9"
 
 val runDir = file("$buildDir/run")
 
@@ -32,8 +31,8 @@ repositories {
 }
 
 java {
-    targetCompatibility = JavaVersion.VERSION_17
-    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_21
 }
 
 val javafxModules = listOf(
@@ -47,7 +46,7 @@ val javafxModules = listOf(
 )
 
 javafx {
-    version = "17.0.9"
+    version = "21.0.2"
     modules = javafxModules.map { "javafx.$it" }
 }
 
@@ -100,7 +99,7 @@ dependencies {
     implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 
-    val terraGitHash = "3aef97738"
+    val terraGitHash = "af9fb211a"
 
     bootstrapTerraAddon("com.dfsek.terra:api-addon-loader:0.1.0-BETA+$terraGitHash")
     bootstrapTerraAddon("com.dfsek.terra:manifest-addon-loader:1.0.0-BETA+$terraGitHash")
@@ -121,7 +120,7 @@ dependencies {
     terraAddon("com.dfsek.terra:config-feature:1.0.0-BETA+$terraGitHash")
     terraAddon("com.dfsek.terra:config-flora:1.0.1-BETA+$terraGitHash")
     terraAddon("com.dfsek.terra:config-locators:1.1.1-BETA+$terraGitHash")
-    terraAddon("com.dfsek.terra:config-noise-function:1.1.0-BETA+$terraGitHash")
+    terraAddon("com.dfsek.terra:config-noise-function:1.2.0-BETA+$terraGitHash")
     terraAddon("com.dfsek.terra:config-number-predicate:1.0.0-BETA+$terraGitHash")
     terraAddon("com.dfsek.terra:config-ore:1.1.1-BETA+$terraGitHash")
     terraAddon("com.dfsek.terra:config-palette:1.0.0-BETA+$terraGitHash")
@@ -141,21 +140,21 @@ dependencies {
     terraAddon("com.dfsek.terra:terrascript-function-sampler:1.0.0-BETA+$terraGitHash")
 
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
 
-    implementation("com.dfsek.terra:base:6.4.1-BETA+$terraGitHash")
+    implementation("com.dfsek.terra:base:6.6.2-BETA+$terraGitHash")
 
-    implementation("ca.solo-studios:slf4k:0.5.3")
+    implementation("ca.solo-studios:slf4k:0.5.4")
 
-    implementation("ch.qos.logback:logback-classic:1.4.14")
+    implementation("ch.qos.logback:logback-classic:1.5.18")
 
-    implementation("com.google.guava:guava:32.1.3-jre")
+    implementation("com.google.guava:guava:33.4.8-jre")
 
     implementation("no.tornado:tornadofx:1.7.20") {
         exclude("org.jetbrains.kotlin")
     }
 
-    implementation("commons-io:commons-io:2.15.1")
+    implementation("commons-io:commons-io:2.19.0")
 
     for (javafxModule in javafxModules) {
         val mavenCoordinates = "org.openjfx:javafx-$javafxModule:${javafx.version}"
@@ -166,15 +165,15 @@ dependencies {
     }
 
     // Jansi for terminal colouring on Windows
-    windowsImplementation("org.fusesource.jansi:jansi:2.4.1")
+    windowsImplementation("org.fusesource.jansi:jansi:2.4.2")
 }
 
 tasks.test {
     useJUnitPlatform()
 }
 
 tasks.withType<KotlinCompile>() {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 val jar by tasks.jar
@@ -192,12 +191,6 @@ tasks.withType<ShadowJar>() {
     configurations.add(project.configurations.runtimeClasspath.orNull)
     exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "module-info.class")
 
-    tasks.register<ConfigureShadowRelocation>(
-        ConfigureShadowRelocation.taskName(this)
-    ) {
-        this@withType.dependsOn(this)
-    }
-
     doFirst {
         archiveVersion.set(project.version.toString())
     }
@@ -263,7 +256,7 @@ val downloadDefaultPacks: Task by tasks.creating() {
     group = "application"
 
     doFirst {
-        val defaultPack = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/latest/default.zip")
+        val defaultPack = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/v1.5.1/default.zip")
         val fileName = defaultPack.file.substring(defaultPack.file.lastIndexOf("/"))
 
         file("$runDir/packs/").mkdirs()

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists