From 51a7899c154c3bf5fc4a51eb5b217b2bae313a48 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Thu, 30 May 2024 10:28:25 +0200 Subject: [PATCH] Experimental support for loom 1.7 --- .github/workflows/{publish-1.6.yml => publish-1.7.yml} | 2 +- build.gradle | 7 ++++--- test-mod/build.gradle | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) rename .github/workflows/{publish-1.6.yml => publish-1.7.yml} (96%) diff --git a/.github/workflows/publish-1.6.yml b/.github/workflows/publish-1.7.yml similarity index 96% rename from .github/workflows/publish-1.6.yml rename to .github/workflows/publish-1.7.yml index c4349a4..9bfe259 100644 --- a/.github/workflows/publish-1.6.yml +++ b/.github/workflows/publish-1.7.yml @@ -3,7 +3,7 @@ name: Publish 1.6 on: push: branches: - - "dev/1.6" + - "dev/1.7" jobs: build: diff --git a/build.gradle b/build.gradle index 8b20cab..e1e7e3a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { group 'net.legacyfabric' base.archivesName = project.name -def baseVersion = '1.6' +def baseVersion = '1.7' def ENV = System.getenv() if (ENV.GITHUB_RUN_NUMBER) { @@ -30,9 +30,10 @@ dependencies { implementation("com.google.code.gson:gson:2.10.1") implementation("com.google.guava:guava:33.0.0-jre") - implementation("net.fabricmc:fabric-loom:${baseVersion}-SNAPSHOT") +// implementation("net.fabricmc:fabric-loom:${baseVersion}-SNAPSHOT") + implementation("net.fabricmc:fabric-loom:${baseVersion}.0-alpha.5") // needed for 'validatePlugins' task, same version as used by fabric-loom - compileOnly("net.fabricmc:mapping-io:0.5.1") + compileOnly("net.fabricmc:mapping-io:0.6.1") } jar { diff --git a/test-mod/build.gradle b/test-mod/build.gradle index a21e4dc..ba81f2c 100644 --- a/test-mod/build.gradle +++ b/test-mod/build.gradle @@ -1,5 +1,5 @@ plugins { - id "fabric-loom" version "1.6-SNAPSHOT" + id "fabric-loom" version "1.7.0-alpha.5" id "legacy-looming" id "maven-publish" } @@ -23,7 +23,7 @@ loom { } legacyLooming { -// useLFIntermediary.set(false) +// intermediaryVersion.set(2) } dependencies {