diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4680e9ecc..5048f6b72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,22 +15,25 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/actions/wrapper-validation@v3 - run: ./gradlew check build publishToMavenLocal --stacktrace -Porg.gradle.parallel.threads=4 --warning-mode=fail - uses: Juuxel/publish-checkstyle-report@v1 if: ${{ failure() }} with: reports: | **/build/reports/checkstyle/*.xml - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 + if: ${{ matrix.java == '21-jdk' }} with: - name: Artifacts + name: Main Artifacts path: build/libs/ - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 + if: ${{ matrix.java == '21-jdk' }} with: - name: Artifacts + name: Modules Artifacts path: ./**/build/libs/ - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 + if: ${{ matrix.java == '21-jdk' }} with: name: Maven Local path: /root/.m2/repository diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 94d337896..1aba3fa0f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/actions/wrapper-validation@v3 - run: ./gradlew checkVersion build publish publishMods --stacktrace env: MAVEN_PUBLISH_CREDENTIALS: ${{ secrets.MAVEN_PUBLISH_CREDENTIALS }} diff --git a/build.gradle b/build.gradle index 78d80a4d7..2758c96a5 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,10 @@ plugins { id "eclipse" id "idea" id "maven-publish" - id "fabric-loom" version "1.7.2" apply false - id "legacy-looming" version "1.7.7" apply false + id "fabric-loom" version "1.8.11" apply false + id "legacy-looming" version "1.8.2" apply false id "com.diffplug.spotless" version "6.20.0" - id "org.ajoberstar.grgit" version "3.1.0" + id "org.ajoberstar.grgit" version "5.2.2" id "me.modmuss50.mod-publish-plugin" version "0.4.5" } @@ -158,7 +158,7 @@ def static setupRepositories(RepositoryHandler repositories) { def ENV = System.getenv() if (ENV.MAVEN_PUBLISH_CREDENTIALS) { repositories.maven { - url "https://repo.legacyfabric.net/repository/legacyfabric" + url "https://maven.legacyfabric.net/" credentials { username ENV.MAVEN_PUBLISH_CREDENTIALS.split(":")[0] password ENV.MAVEN_PUBLISH_CREDENTIALS.split(":")[1] diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index f9534bfe1..48f06c38f 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -7,6 +7,6 @@ repositories { } dependencies { - implementation("net.fabricmc:fabric-loader:0.15.6") + implementation("net.fabricmc:fabric-loader:0.16.8") implementation("commons-codec:commons-codec:1.16.1") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f..a4b76b953 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 a4413138c..9355b4155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf133..f5feea6d6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e46..9b42019c7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle b/settings.gradle index 9181e3e3d..659c6806e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } maven { name = "legacy-fabric" - url = "https://repo.legacyfabric.net/repository/legacyfabric/" + url = "https://maven.legacyfabric.net/" } gradlePluginPortal() mavenLocal()