imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 21:47:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #790 (#791)

Browse Source
This commit is contained in:
modmuss50
2023-01-06 10:58:26 +00:00
committed by GitHub
parent b79b64298b
commit fea5fee15f
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
View File

@@ -64,15 +64,17 @@ public abstract class AnnotationProcessorInvoker<T extends Task> {
protected final Project project;
protected final MixinExtension mixinExtension;
protected final Map<SourceSet, T> invokerTasks;
private final String name;
private final Collection<Configuration> apConfigurations;
protected AnnotationProcessorInvoker(Project project,
Collection<Configuration> apConfigurations,
Map<SourceSet, T> invokerTasks) {
Collection<Configuration> apConfigurations,
Map<SourceSet, T> invokerTasks, String name) {
this.project = project;
this.mixinExtension = LoomGradleExtension.get(project).getMixin();
this.apConfigurations = apConfigurations;
this.invokerTasks = invokerTasks;
this.name = name;
}
protected static Collection<Configuration> getApConfigurations(Project project, Function<SourceSet, String> getApConfigNameFunc) {
@@ -95,7 +97,7 @@ public abstract class AnnotationProcessorInvoker<T extends Task> {
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<String, String> args = new HashMap<>() {{
put(Constants.MixinArguments.IN_MAP_FILE_NAMED_INTERMEDIARY, loom.getMappingsProvider().tinyMappings.toFile().getCanonicalPath());

3
src/main/java/net/fabricmc/loom/build/mixin/GroovyApInvoker.java
View File

@@ -42,7 +42,8 @@ public class GroovyApInvoker extends AnnotationProcessorInvoker<GroovyCompile> {
super(
project,
ImmutableList.of(),
getInvokerTasks(project));
getInvokerTasks(project),
AnnotationProcessorInvoker.GROOVY);
}
private static Map<SourceSet, GroovyCompile> getInvokerTasks(Project project) {

3
src/main/java/net/fabricmc/loom/build/mixin/JavaApInvoker.java
View File

@@ -41,7 +41,8 @@ public class JavaApInvoker extends AnnotationProcessorInvoker<JavaCompile> {
super(
project,
AnnotationProcessorInvoker.getApConfigurations(project, SourceSet::getAnnotationProcessorConfigurationName),
getInvokerTasks(project));
getInvokerTasks(project),
AnnotationProcessorInvoker.JAVA);
}
private static Map<SourceSet, JavaCompile> getInvokerTasks(Project project) {

3
src/main/java/net/fabricmc/loom/build/mixin/KaptApInvoker.java
View File

@@ -51,7 +51,8 @@ public class KaptApInvoker extends AnnotationProcessorInvoker<JavaCompile> {
super(
project,
AnnotationProcessorInvoker.getApConfigurations(project, KaptApInvoker::getKaptConfigurationName),
getInvokerTasks(project));
getInvokerTasks(project),
"Kotlin");
try {
dummyRefmapDirectory = Files.createTempDirectory("temp_refmap").toFile();

3
src/main/java/net/fabricmc/loom/build/mixin/ScalaApInvoker.java
View File

@@ -43,7 +43,8 @@ public class ScalaApInvoker extends AnnotationProcessorInvoker<ScalaCompile> {
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<SourceSet, ScalaCompile> getInvokerTasks(Project project) {