diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46094cd3..7a885739 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,27 +9,27 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Set up JDK 23 for x64 - uses: actions/setup-java@v4 + - uses: actions/checkout@v6 + - name: Set up JDK 25 for x64 + uses: actions/setup-java@v5 with: - java-version: '23' + java-version: '25' distribution: 'temurin' architecture: x64 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 with: - gradle-version: 9.3.1 + gradle-version: 9.5.1 - name: Build TASmod with Gradle run: gradle build - name: Upload Test Report - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 if: ${{ !cancelled() }} with: name: TestResult path: build/test-results/test/*.xml - name: Upload TASmod-Dev-Build - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: TASmod-Dev-Build path: build/libs diff --git a/.github/workflows/buildandupload.yml b/.github/workflows/buildandupload.yml index 9135abe6..c21d9ba7 100644 --- a/.github/workflows/buildandupload.yml +++ b/.github/workflows/buildandupload.yml @@ -15,21 +15,21 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'MinecraftTAS/TASmod' steps: - - uses: actions/checkout@v4 - - name: Set up JDK 23 for x64 - uses: actions/setup-java@v4 + - uses: actions/checkout@v6 + - name: Set up JDK 25 for x64 + uses: actions/setup-java@v5 with: - java-version: '23' + java-version: '25' distribution: 'temurin' architecture: x64 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 with: - gradle-version: 9.3.1 + gradle-version: 9.5.1 - name: Build TASmod with Gradle run: gradle build - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: TASmod-Dev-Build path: build/libs diff --git a/.github/workflows/check_formatting.yml b/.github/workflows/check_formatting.yml index 1c85923d..f7bdc9ce 100644 --- a/.github/workflows/check_formatting.yml +++ b/.github/workflows/check_formatting.yml @@ -9,16 +9,16 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Set up JDK 23 for x64 - uses: actions/setup-java@v4 + - uses: actions/checkout@v6 + - name: Set up JDK 25 for x64 + uses: actions/setup-java@v5 with: - java-version: '23' + java-version: '25' distribution: 'temurin' architecture: x64 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 with: - gradle-version: 9.3.1 + gradle-version: 9.5.1 - name: Spotless Check run: gradle spotlessCheck diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4b82da6..81175913 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,21 +7,21 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'MinecraftTAS/TASmod' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: - java-version: '23' + java-version: '25' distribution: 'temurin' architecture: x64 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 with: - gradle-version: 9.3.1 + gradle-version: 9.5.1 - name: Setup workspace run: gradle build -Prelease=true - name: Upload assets - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v3 with: files: 'build/libs/!(-@(dev|sources|javadoc|all)).jar' - name: Publish 1.12.2 diff --git a/.github/workflows/test_report.yml b/.github/workflows/test_report.yml index b477f519..46b9a435 100644 --- a/.github/workflows/test_report.yml +++ b/.github/workflows/test_report.yml @@ -12,7 +12,7 @@ jobs: report: runs-on: ubuntu-latest steps: - - uses: dorny/test-reporter@v2 + - uses: dorny/test-reporter@v3 with: artifact: TestResult name: TASmod Tests diff --git a/build.gradle b/build.gradle index 47a057d6..9d749c73 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,6 @@ loom { repositories { mavenCentral() maven { url = "https://maven.minecrafttas.com/main" } - maven { url = "https://maven.legacyfabric.net/" } //maven { url = "https://maven.minecrafttas.com/snapshots" } maven { url = "https://jitpack.io" } maven { url = "https://repo.spongepowered.org/maven" } @@ -46,7 +45,7 @@ configurations { } ploceus { - setIntermediaryGeneration(2) + setIntermediaryGeneration(1) } // dependencies diff --git a/gradle.properties b/gradle.properties index 3250f74e..34f24e9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G # Fabric properties minecraft_version=1.12.2 -loader_version=0.18.4 -loom_version=1.15-SNAPSHOT +loader_version=0.19.3 +loom_version=1.17-SNAPSHOT mcp_channel=stable mcp_build=39 mcp_mcversion=1.12 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 61285a65..b1b8ef56 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 37f78a6a..df6a6ad7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index adff685a..b9bb139f 100644 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index e509b2dd..aa5f10b0 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -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! -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 - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%