diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8923d4b187..ef98f2f95b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,10 @@ name: Build -on: [push, pull_request] +on: [push, pull_request, merge_group] jobs: build: strategy: matrix: - java: [17-jdk, 18-jdk] + java: [17-jdk, 20-jdk] runs-on: ubuntu-20.04 container: image: eclipse-temurin:${{ matrix.java }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 25bff80447..a70d268e24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-20.04 container: - image: eclipse-temurin:18-jdk + image: eclipse-temurin:20-jdk options: --user root steps: - run: apt update && apt install git -y && git --version diff --git a/build.gradle b/build.gradle index a42dc2d505..327a55944e 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ plugins { id "idea" id "maven-publish" id 'jacoco' - id "fabric-loom" version "1.1.10" apply false - id "com.diffplug.spotless" version "6.11.0" + id "fabric-loom" version "1.2.4" apply false + id "com.diffplug.spotless" version "6.18.0" id "org.ajoberstar.grgit" version "3.1.0" id "com.matthewprenger.cursegradle" version "1.4.0" id "com.modrinth.minotaur" version "2.4.3" @@ -224,7 +224,7 @@ allprojects { checkstyle { configFile = rootProject.file("checkstyle.xml") - toolVersion = "10.3.3" + toolVersion = "10.9.3" } tasks.withType(AbstractArchiveTask) { @@ -251,17 +251,17 @@ allprojects { [jar, sourcesJar].each { it.from(rootProject.file("LICENSE")) { - rename { "${it}-${project.archivesBaseName}"} + rename { "${it}-${project.base.archivesName.get()}"} } } if (file("src/client").exists() && !file("src/main").exists()) { remapJar { - additionalClientOnlyEntries.add("LICENSE-${project.archivesBaseName}") + additionalClientOnlyEntries.add("LICENSE-${project.base.archivesName.get()}") } remapSourcesJar { - additionalClientOnlyEntries.add("LICENSE-${project.archivesBaseName}") + additionalClientOnlyEntries.add("LICENSE-${project.base.archivesName.get()}") } } @@ -410,7 +410,7 @@ configurations { productionRuntime { extendsFrom configurations.minecraftLibraries extendsFrom configurations.loaderLibraries - extendsFrom configurations.minecraftRuntimeOnlyLibraries + extendsFrom configurations.minecraftRuntimeLibraries } productionRuntimeServer } @@ -422,7 +422,7 @@ dependencies { productionRuntimeServer "net.fabricmc:fabric-installer:${project.installer_version}:server" } -import net.fabricmc.loom.util.OperatingSystem +import net.fabricmc.loom.util.Platform // This is very far beyond loom's API if you copy this, you're on your own. task runProductionAutoTestClient(type: JavaExec, dependsOn: [remapJar, remapTestmodJar]) { @@ -444,7 +444,7 @@ task runProductionAutoTestClient(type: JavaExec, dependsOn: [remapJar, remapTest "--gameDir", workingDir.absolutePath ) - if (OperatingSystem.CURRENT_OS == OperatingSystem.MAC_OS) { + if (Platform.CURRENT.operatingSystem.isMacOS()) { jvmArgs( "-XstartOnFirstThread" ) diff --git a/gradle.properties b/gradle.properties index 2c4e2b48fe..9d728da7be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ fabric.loom.multiProjectOptimisation=true version=0.78.1 minecraft_version=23w16a yarn_version=+build.4 -loader_version=0.14.18 +loader_version=0.14.19 installer_version=0.11.1 prerelease=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f0..c1962a79e2 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 ae04661ee7..37aef8d3f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefaa5f..aeb74cbb43 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done 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"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index bc2a4e5dd1..d765cd717b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,7 +19,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.14.18", + "fabricloader": ">=0.14.19", "java": ">=17", "minecraft": ">=1.20- <1.20.1-" },