From b79b64298be413afaccb1c24d48e795798fb2af0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 18 Dec 2022 15:59:53 +0000 Subject: [PATCH 1/2] Update mercury (#777) --- build.gradle | 2 +- src/main/java/net/fabricmc/loom/util/Constants.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9c18bf1f..a8f5c65d 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ dependencies { implementation ('net.fabricmc:cfr:0.1.1') // source code remapping - implementation ('net.fabricmc:mercury:0.2.6') + implementation ('net.fabricmc:mercury:0.3.0') // Kotlin implementation('org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.2') { diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index f5e694ea..63e94443 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -24,7 +24,6 @@ package net.fabricmc.loom.util; -import org.eclipse.jdt.core.JavaCore; import org.objectweb.asm.Opcodes; public class Constants { @@ -35,7 +34,7 @@ public class Constants { public static final String FABRIC_REPOSITORY = "https://maven.fabricmc.net/"; public static final int ASM_VERSION = Opcodes.ASM9; - public static final String MERCURY_SOURCE_VERSION = JavaCore.VERSION_17; + public static final String MERCURY_SOURCE_VERSION = "17"; private Constants() { } From fea5fee15f2873ee78f96ab11660ae60f4476b03 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 6 Jan 2023 10:58:26 +0000 Subject: [PATCH 2/2] Fix #790 (#791) --- .../loom/build/mixin/AnnotationProcessorInvoker.java | 8 +++++--- .../net/fabricmc/loom/build/mixin/GroovyApInvoker.java | 3 ++- .../java/net/fabricmc/loom/build/mixin/JavaApInvoker.java | 3 ++- .../java/net/fabricmc/loom/build/mixin/KaptApInvoker.java | 3 ++- .../net/fabricmc/loom/build/mixin/ScalaApInvoker.java | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java b/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java index 615059dc..6df0fcc9 100644 --- a/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java +++ b/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java @@ -64,15 +64,17 @@ public abstract class AnnotationProcessorInvoker { protected final Project project; protected final MixinExtension mixinExtension; protected final Map invokerTasks; + private final String name; private final Collection apConfigurations; protected AnnotationProcessorInvoker(Project project, - Collection apConfigurations, - Map invokerTasks) { + Collection apConfigurations, + Map invokerTasks, String name) { this.project = project; this.mixinExtension = LoomGradleExtension.get(project).getMixin(); this.apConfigurations = apConfigurations; this.invokerTasks = invokerTasks; + this.name = name; } protected static Collection getApConfigurations(Project project, Function getApConfigNameFunc) { @@ -95,7 +97,7 @@ public abstract class AnnotationProcessorInvoker { final File mixinMappings = MixinMappingsService.getMixinMappingFile(project, sourceSet); - task.getOutputs().file(mixinMappings).withPropertyName("mixin-ap-" + sourceSet.getName()).optional(); + task.getOutputs().file(mixinMappings).withPropertyName("mixin-ap-" + sourceSet.getName() + "-" + name).optional(); Map args = new HashMap<>() {{ put(Constants.MixinArguments.IN_MAP_FILE_NAMED_INTERMEDIARY, loom.getMappingsProvider().tinyMappings.toFile().getCanonicalPath()); diff --git a/src/main/java/net/fabricmc/loom/build/mixin/GroovyApInvoker.java b/src/main/java/net/fabricmc/loom/build/mixin/GroovyApInvoker.java index 2f0d9623..ab85b465 100644 --- a/src/main/java/net/fabricmc/loom/build/mixin/GroovyApInvoker.java +++ b/src/main/java/net/fabricmc/loom/build/mixin/GroovyApInvoker.java @@ -42,7 +42,8 @@ public class GroovyApInvoker extends AnnotationProcessorInvoker { super( project, ImmutableList.of(), - getInvokerTasks(project)); + getInvokerTasks(project), + AnnotationProcessorInvoker.GROOVY); } private static Map getInvokerTasks(Project project) { diff --git a/src/main/java/net/fabricmc/loom/build/mixin/JavaApInvoker.java b/src/main/java/net/fabricmc/loom/build/mixin/JavaApInvoker.java index 00f3d980..5450009d 100644 --- a/src/main/java/net/fabricmc/loom/build/mixin/JavaApInvoker.java +++ b/src/main/java/net/fabricmc/loom/build/mixin/JavaApInvoker.java @@ -41,7 +41,8 @@ public class JavaApInvoker extends AnnotationProcessorInvoker { super( project, AnnotationProcessorInvoker.getApConfigurations(project, SourceSet::getAnnotationProcessorConfigurationName), - getInvokerTasks(project)); + getInvokerTasks(project), + AnnotationProcessorInvoker.JAVA); } private static Map getInvokerTasks(Project project) { diff --git a/src/main/java/net/fabricmc/loom/build/mixin/KaptApInvoker.java b/src/main/java/net/fabricmc/loom/build/mixin/KaptApInvoker.java index d17b34b7..f5ae7554 100644 --- a/src/main/java/net/fabricmc/loom/build/mixin/KaptApInvoker.java +++ b/src/main/java/net/fabricmc/loom/build/mixin/KaptApInvoker.java @@ -51,7 +51,8 @@ public class KaptApInvoker extends AnnotationProcessorInvoker { super( project, AnnotationProcessorInvoker.getApConfigurations(project, KaptApInvoker::getKaptConfigurationName), - getInvokerTasks(project)); + getInvokerTasks(project), + "Kotlin"); try { dummyRefmapDirectory = Files.createTempDirectory("temp_refmap").toFile(); diff --git a/src/main/java/net/fabricmc/loom/build/mixin/ScalaApInvoker.java b/src/main/java/net/fabricmc/loom/build/mixin/ScalaApInvoker.java index d361b837..81133208 100644 --- a/src/main/java/net/fabricmc/loom/build/mixin/ScalaApInvoker.java +++ b/src/main/java/net/fabricmc/loom/build/mixin/ScalaApInvoker.java @@ -43,7 +43,8 @@ public class ScalaApInvoker extends AnnotationProcessorInvoker { project, // Scala just uses the java AP configuration afaik. This of course assumes the java AP also gets configured. ImmutableList.of(), - getInvokerTasks(project)); + getInvokerTasks(project), + AnnotationProcessorInvoker.SCALA); } private static Map getInvokerTasks(Project project) {