From 0a6760dcb77341b8bbd4ee66da206560e7c86a2f Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:23:41 +0100 Subject: [PATCH] Bump dependencies (#387) --- build.gradle | 11 ++++++----- gradle.properties | 2 +- gradlew | 2 +- gradlew.bat | 2 +- jitpack.yml | 4 ++-- settings.gradle.kts | 2 +- src/main/resources/fabric.mod.json | 2 +- viafabric-mc1201/build.gradle.kts | 2 +- viafabric-mc1204/build.gradle.kts | 4 ++-- viafabric-mc1206/build.gradle.kts | 4 ++-- viafabric-mc1214/build.gradle.kts | 2 +- viafabric-mc1214/src/main/resources/fabric.mod.json | 2 +- 12 files changed, 20 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 083205e9..7bc65905 100644 --- a/build.gradle +++ b/build.gradle @@ -9,19 +9,19 @@ import java.util.stream.IntStream plugins { id "java" id "maven-publish" - id "org.ajoberstar.grgit" version "5.2.2" + id "org.ajoberstar.grgit" version "5.3.0" id "com.matthewprenger.cursegradle" version "1.4.0" // This repository is archived on GH id "com.modrinth.minotaur" version "2.8.7" - id "fabric-loom" version "1.8-SNAPSHOT" apply false + id "fabric-loom" version "1.9-SNAPSHOT" apply false id "com.github.ben-manes.versions" version "0.51.0" - id "xyz.wagyourtail.jvmdowngrader" version "0.7.1" + id "xyz.wagyourtail.jvmdowngrader" version "1.2.1" } def ENV = System.getenv() group = "com.viaversion.fabric" description = "Client-side and server-side ViaVersion implementation for Fabric" -version = "0.4.16+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch() +version = "0.4.17+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch() logger.lifecycle("Building ViaFabric: $version") def getBranch() { @@ -66,6 +66,7 @@ allprojects { maven { url = "https://maven.fabricmc.net/" } maven { url = "https://maven.legacyfabric.net/" } maven { url = "https://maven.terraformersmc.com/releases/" } + maven { url = "https://maven.nucleoid.xyz/" } maven { url = "https://jitpack.io/" } } @@ -187,7 +188,7 @@ processResources { List mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(",")) .map({ it -> it.trim() }) .collect(Collectors.toList()) -List javaVersions = IntStream.rangeClosed(8, 22) +List javaVersions = IntStream.rangeClosed(8, 24) .mapToObj { n -> (String) "Java $n" } .collect(Collectors.toList()) String changelogMsg = "A changelog can be found at https://github.com/ViaVersion/ViaFabric/commits" diff --git a/gradle.properties b/gradle.properties index dfb60c82..06789157 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication loader_version=0.16.9 viaver_version=5.1.2-SNAPSHOT -publish_mc_versions=1.21.4, 1.21.3, 1.21.2, 1.20.6, 1.20.4, 1.20.1, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4 +publish_mc_versions=1.21.4, 1.20.6, 1.20.4, 1.20.1, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4 # example: 1.19.1-rc1. Can be a blank value modrinth_mc_snapshot= # example: 1.19-Snapshot. Can be a blank value diff --git a/gradlew b/gradlew index f5feea6d..d95bf613 100755 --- a/gradlew +++ b/gradlew @@ -203,7 +203,7 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..640d6868 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME% for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/jitpack.yml b/jitpack.yml index 3e3cf70d..045fcb31 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -3,5 +3,5 @@ before_install: - curl -s "https://get.sdkman.io" | bash - source ~/.sdkman/bin/sdkman-init.sh - - sdk install java 21.0.3-tem - - sdk use java 21.0.3-tem + - sdk install java 21.0.5-tem + - sdk use java 21.0.5-tem diff --git a/settings.gradle.kts b/settings.gradle.kts index 2bda6a05..7c308a6a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,5 +20,5 @@ include("viafabric-mc1206") include("viafabric-mc1214") plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0ca3929e..8502eb25 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -12,7 +12,7 @@ "discord": "https://discord.gg/viaversion" }, "depends": { - "minecraft": ["1.14.4", "1.15.2", "1.16.4", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.1", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21.2", "1.21.3", "1.21.4"], + "minecraft": ["1.14.4", "1.15.2", "1.16.4", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.1", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21.4"], "viaversion": ">=5.0.0" }, "breaks": { diff --git a/viafabric-mc1201/build.gradle.kts b/viafabric-mc1201/build.gradle.kts index 6f282e96..b293fe7a 100644 --- a/viafabric-mc1201/build.gradle.kts +++ b/viafabric-mc1201/build.gradle.kts @@ -2,7 +2,7 @@ dependencies { minecraft("com.mojang:minecraft:1.20.1") mappings("net.fabricmc:yarn:1.20.1+build.10:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.92.1+1.20.1") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.92.2+1.20.1") modImplementation("com.terraformersmc:modmenu:7.2.2") } diff --git a/viafabric-mc1204/build.gradle.kts b/viafabric-mc1204/build.gradle.kts index 828a0879..1229e18e 100644 --- a/viafabric-mc1204/build.gradle.kts +++ b/viafabric-mc1204/build.gradle.kts @@ -2,8 +2,8 @@ dependencies { minecraft("com.mojang:minecraft:1.20.4") mappings("net.fabricmc:yarn:1.20.4+build.3:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.97.1+1.20.4") - modImplementation("com.terraformersmc:modmenu:9.0.0") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.97.2+1.20.4") + modImplementation("com.terraformersmc:modmenu:9.2.0") } tasks.compileJava { diff --git a/viafabric-mc1206/build.gradle.kts b/viafabric-mc1206/build.gradle.kts index db24549a..9a2af8bc 100644 --- a/viafabric-mc1206/build.gradle.kts +++ b/viafabric-mc1206/build.gradle.kts @@ -2,8 +2,8 @@ dependencies { minecraft("com.mojang:minecraft:1.20.6") mappings("net.fabricmc:yarn:1.20.6+build.3:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.100.0+1.20.6") - modImplementation("com.terraformersmc:modmenu:10.0.0-beta.1") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.100.8+1.20.6") + modImplementation("com.terraformersmc:modmenu:10.0.0") } tasks.compileJava { diff --git a/viafabric-mc1214/build.gradle.kts b/viafabric-mc1214/build.gradle.kts index cf2ab452..84bad73e 100644 --- a/viafabric-mc1214/build.gradle.kts +++ b/viafabric-mc1214/build.gradle.kts @@ -3,7 +3,7 @@ dependencies { mappings("net.fabricmc:yarn:1.21.4+build.1:v2") modImplementation("net.fabricmc.fabric-api:fabric-api:0.110.5+1.21.4") - modImplementation("com.terraformersmc:modmenu:12.0.0-beta.1") + modImplementation("com.terraformersmc:modmenu:13.0.0-beta.1") } tasks.compileJava { diff --git a/viafabric-mc1214/src/main/resources/fabric.mod.json b/viafabric-mc1214/src/main/resources/fabric.mod.json index cb93f29e..7736d356 100644 --- a/viafabric-mc1214/src/main/resources/fabric.mod.json +++ b/viafabric-mc1214/src/main/resources/fabric.mod.json @@ -58,7 +58,7 @@ }, "depends": { "fabric-resource-loader-v0": "*", - "minecraft": ["1.21.2", "1.21.3", "1.21.4"], + "minecraft": "1.21.4", "viafabric": "*" }, "recommends": {