From 50d6fd298d7ac450dea1b8475c43e73255e674b5 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 2 Jun 2021 09:06:26 +0100 Subject: [PATCH] Update mercury (#408) --- 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, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ff50ae2..81a11c7 100644 --- a/build.gradle +++ b/build.gradle @@ -85,7 +85,7 @@ dependencies { implementation ('org.benf:cfr:0.151') // source code remapping - implementation ('org.cadixdev:mercury:0.1.0-rc1') + implementation ('net.fabricmc:mercury:0.2.0') // 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 2d0640a..88cea9a 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-20210527220045+0000" + final static String PRE_RELEASE_GRADLE = "7.2-20210531220051+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 b97f524..dbf1f7e 100644 --- a/src/test/resources/projects/java16/build.gradle +++ b/src/test/resources/projects/java16/build.gradle @@ -15,6 +15,7 @@ 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 0d8b3c7..24ef9a9 100644 --- a/src/test/resources/projects/java16/gradle.properties +++ b/src/test/resources/projects/java16/gradle.properties @@ -1,8 +1,9 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=21w19a -yarn_mappings=21w19a+build.1 -loader_version=0.11.2 +minecraft_version=1.17-pre3 +yarn_mappings=1.17-pre3+build.1 +loader_version=0.11.3 +fabric_version=0.34.8+1.17 mod_version = 1.0.0 maven_group = com.example