From 4763760984c3ed604151f1c2f59b14487ebfd884 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 2 Jun 2021 23:05:51 +0100 Subject: [PATCH] Revert "Update mercury (#408)" This reverts commit 50d6fd298d7ac450dea1b8475c43e73255e674b5. --- build.gradle | 2 +- .../net/fabricmc/loom/test/util/ProjectTestTrait.groovy | 2 +- src/test/resources/projects/java16/build.gradle | 1 - src/test/resources/projects/java16/gradle.properties | 7 +++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 81a11c7..ff50ae2 100644 --- a/build.gradle +++ b/build.gradle @@ -85,7 +85,7 @@ dependencies { implementation ('org.benf:cfr:0.151') // source code remapping - implementation ('net.fabricmc:mercury:0.2.0') + implementation ('org.cadixdev:mercury:0.1.0-rc1') // Kapt integration compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0') diff --git a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy index 88cea9a..2d0640a 100644 --- a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy @@ -29,7 +29,7 @@ import org.gradle.testkit.runner.GradleRunner trait ProjectTestTrait { final static String DEFAULT_GRADLE = "7.0.1" - final static String PRE_RELEASE_GRADLE = "7.2-20210531220051+0000" + final static String PRE_RELEASE_GRADLE = "7.2-20210527220045+0000" static File gradleHome = File.createTempDir() File testProjectDir = File.createTempDir() diff --git a/src/test/resources/projects/java16/build.gradle b/src/test/resources/projects/java16/build.gradle index dbf1f7e..b97f524 100644 --- a/src/test/resources/projects/java16/build.gradle +++ b/src/test/resources/projects/java16/build.gradle @@ -15,7 +15,6 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } tasks.withType(JavaCompile).configureEach { diff --git a/src/test/resources/projects/java16/gradle.properties b/src/test/resources/projects/java16/gradle.properties index 24ef9a9..0d8b3c7 100644 --- a/src/test/resources/projects/java16/gradle.properties +++ b/src/test/resources/projects/java16/gradle.properties @@ -1,9 +1,8 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=1.17-pre3 -yarn_mappings=1.17-pre3+build.1 -loader_version=0.11.3 -fabric_version=0.34.8+1.17 +minecraft_version=21w19a +yarn_mappings=21w19a+build.1 +loader_version=0.11.2 mod_version = 1.0.0 maven_group = com.example