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 c3a904c9..09cfd3c9 100644 --- a/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java +++ b/src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java @@ -65,16 +65,18 @@ public abstract class AnnotationProcessorInvoker { private final LoomGradleExtension loomExtension; 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.loomExtension = LoomGradleExtension.get(project); this.mixinExtension = loomExtension.getMixin(); this.apConfigurations = apConfigurations; this.invokerTasks = invokerTasks; + this.name = name; } protected static Collection getApConfigurations(Project project, Function getApConfigNameFunc) { @@ -97,7 +99,7 @@ public abstract class AnnotationProcessorInvoker { final File mixinMappings = getMixinMappingsForSourceSet(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.getMappingConfiguration().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) {