diff --git a/build.gradle.kts b/build.gradle.kts index e01b775..706715a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - val indraVersion = "3.0.1" + val indraVersion = "3.1.3" id("net.kyori.indra") version indraVersion id("net.kyori.indra.checkstyle") version indraVersion id("net.kyori.indra.license-header") version indraVersion @@ -11,30 +11,30 @@ version = "1.1.7-SNAPSHOT" group = "xyz.jpenilla" description = "Server-side Fabric mod enhancing the console with tab completions, colored log output, command syntax highlighting, command history, and more." -val minecraftVersion = "1.20.1" +val minecraftVersion = "1.20.2" dependencies { minecraft("com.mojang", "minecraft", minecraftVersion) mappings(loom.officialMojangMappings()) - modImplementation("net.fabricmc", "fabric-loader", "0.14.21") - modImplementation("net.fabricmc.fabric-api", "fabric-api", "0.83.0+1.20.1") + modImplementation("net.fabricmc", "fabric-loader", "0.14.22") + modImplementation("net.fabricmc.fabric-api", "fabric-api", "0.89.2+1.20.2") - annotationProcessor("org.apache.logging.log4j", "log4j-core", "2.17.1") + annotationProcessor("org.apache.logging.log4j", "log4j-core", "2.19.0") - val jlineVersion = "3.21.0" + val jlineVersion = "3.23.0" implementation(include("org.jline", "jline", jlineVersion)) implementation(include("org.jline", "jline-terminal-jansi", jlineVersion)) implementation(include("org.fusesource.jansi", "jansi", "2.4.0")) - modImplementation(include("net.kyori", "adventure-platform-fabric", "5.9.0")) + modImplementation(include("net.kyori", "adventure-platform-fabric", "5.10.0")) implementation(include("com.typesafe:config:1.4.2")!!) implementation(include("io.leangen.geantyref:geantyref:1.3.13")!!) implementation(include("org.spongepowered:configurate-core:4.1.2")!!) implementation(include("org.spongepowered:configurate-hocon:4.1.2")!!) - compileOnly("org.checkerframework", "checker-qual", "3.28.0") + compileOnly("org.checkerframework", "checker-qual", "3.38.0") implementation(include("net.fabricmc", "mapping-io", "0.4.2")) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..ac72c34 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..0adc8e1 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. diff --git a/settings.gradle.kts b/settings.gradle.kts index 8ca0224..0dc1477 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,13 +16,13 @@ pluginManagement { repositories { gradlePluginPortal() maven("https://maven.fabricmc.net/") - maven("https://maven.quiltmc.org/repository/release/") maven("https://repo.jpenilla.xyz/snapshots/") } } plugins { - id("quiet-fabric-loom") version "1.2-SNAPSHOT" + id("quiet-fabric-loom") version "1.3-SNAPSHOT" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" } rootProject.name = "better-fabric-console"