From 3440b8d8a82109603d5aebf0ed90172929c22304 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 28 Feb 2021 12:17:05 +0100 Subject: [PATCH] Update loom to 0.6 --- build.gradle | 6 ++++-- jGui | 2 +- root.gradle.kts | 7 +------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 5e9b99ab..0cb9e844 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ buildscript { dependencies { classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2' if (fabric) { - classpath 'fabric-loom:fabric-loom.gradle.plugin:0.5-SNAPSHOT' + classpath 'fabric-loom:fabric-loom.gradle.plugin:0.6-SNAPSHOT' } else if (mcVersion >= 11400) { classpath('net.minecraftforge.gradle:ForgeGradle:3.+'){ exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one @@ -124,7 +124,9 @@ archivesBaseName = "replaymod" if (FABRIC) { minecraft { refmapName = 'mixins.replaymod.refmap.json' - autoGenIDERuns = true + runConfigs.all { + ideConfigGenerated = true + } } } else { minecraft { diff --git a/jGui b/jGui index 96edf0fe..3b654f3a 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit 96edf0fe31a1bef9ed286c01af994527566ab45c +Subproject commit 3b654f3a388fa649d144c0d93a3b4a84dda4ae56 diff --git a/root.gradle.kts b/root.gradle.kts index 07a56fa3..abecc8c4 100755 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -2,7 +2,7 @@ import groovy.json.JsonOutput import java.io.ByteArrayOutputStream plugins { - id("fabric-loom") version "0.5-SNAPSHOT" apply false + id("fabric-loom") version "0.6-SNAPSHOT" apply false id("com.replaymod.preprocess") version "3d85a00" id("com.github.hierynomus.license") version "0.15.0" } @@ -25,11 +25,6 @@ if (gitDescribe().endsWith("*")) { group = "com.replaymod" -// Loom tries to find the active mixin version by recursing up to the root project and checking each project's -// compileClasspath and build script classpath (in that order). Since we've loom in our root project's classpath, -// loom will only find it after checking the root project's compileClasspath (which doesn't exist by default). -configurations.register("compileClasspath") - val shadowJar by tasks.creating(Copy::class) { into("$buildDir/libs") }