From 3266f46d17b1105e71e47113bd84951873644a84 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Sat, 4 Oct 2025 12:15:48 +0200 Subject: [PATCH 1/3] Dump gradle version to 9, dump to 5.2.0, remove cache in CI --- .gitea/workflows/ci.yml | 18 +++++++++--------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 0c340d7..f720543 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -8,7 +8,7 @@ on: push: branches: [ master, dev ] pull_request: - branches: [ master, dev ] + branches: [ dev ] env: REPO_USERNAME: Altarik @@ -33,14 +33,14 @@ jobs: with: java-version: ${{ matrix.java }} distribution: 'temurin' - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- +# - uses: actions/cache@v3 +# with: +# path: | +# ~/.gradle/caches +# ~/.gradle/wrapper +# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} +# restore-keys: | +# ${{ runner.os }}-gradle- - name: make gradle wrapper executable if: ${{ runner.os != 'Windows' }} run: | diff --git a/gradle.properties b/gradle.properties index 158824f..c0a342c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ hibernate_version=6.6.3.Final loom_version=1.11-SNAPSHOT maven_group=fr.altarik.toolbox -maven_version=5.2.0-SNAPSHOT +maven_version=5.2.0 git_owner=quentinlegot git_repo=Toolbox \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5c82cb0..d706aba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- 2.49.1 From fdf51d95c1efdb61ddd41b28da5843affe9b5af7 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Sat, 4 Oct 2025 12:25:51 +0200 Subject: [PATCH 2/3] Update junit to 5.14 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c0a342c..135851a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx1G fabric.loom.multiProjectOptimisation=true -junit_version=5.9.0 +junit_version=5.14.0 minecraft_version=1.20.4 yarn_mappings=1.20.4+build.3 loader_version=0.17.2 -- 2.49.1 From 5e12403a5a15207a8d9cab20021f82c1a36a6062 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Sat, 4 Oct 2025 12:31:52 +0200 Subject: [PATCH 3/3] Fix tests --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 67b7e73..0ec62e7 100644 --- a/build.gradle +++ b/build.gradle @@ -81,8 +81,8 @@ allprojects { } dependencies { - testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit_version}" + testImplementation "org.junit.jupiter:junit-jupiter:${project.junit_version}" + testRuntimeOnly "org.junit.platform:junit-platform-launcher" minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" -- 2.49.1