hibiscus-client
/
fabric-loom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update mercury (#408)

dev/0.11
modmuss50 2021-06-02 09:06:26 +01:00 committed by GitHub
parent 188bbe57d6
commit 50d6fd298d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -85,7 +85,7 @@ dependencies {
implementation ('org.benf:cfr:0.151') implementation ('org.benf:cfr:0.151')
// source code remapping // source code remapping
implementation ('org.cadixdev:mercury:0.1.0-rc1') implementation ('net.fabricmc:mercury:0.2.0')
// Kapt integration // Kapt integration
compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0') compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0')

2
src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
View File

@ -29,7 +29,7 @@ import org.gradle.testkit.runner.GradleRunner
trait ProjectTestTrait { trait ProjectTestTrait {
final static String DEFAULT_GRADLE = "7.0.1" 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() static File gradleHome = File.createTempDir()
File testProjectDir = File.createTempDir() File testProjectDir = File.createTempDir()

1
src/test/resources/projects/java16/build.gradle
View File

@ -15,6 +15,7 @@ dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}" minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {

7
src/test/resources/projects/java16/gradle.properties
View File

@ -1,8 +1,9 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
minecraft_version=21w19a minecraft_version=1.17-pre3
yarn_mappings=21w19a+build.1 yarn_mappings=1.17-pre3+build.1
loader_version=0.11.2 loader_version=0.11.3
fabric_version=0.34.8+1.17
mod_version = 1.0.0 mod_version = 1.0.0
maven_group = com.example maven_group = com.example