General code cleanup (#313)

* First general cleanup pass

* Review feedback

* Fix build

* Fix tests

1 files changed, 50 insertions, 0 deletions

diff --git a/src/main/java/net/fabricmc/loom/build/mixin/ScalaApInvoker.java b/src/main/java/net/fabricmc/loom/build/mixin/ScalaApInvoker.java
new file mode 100644
index 00000000..7fed5610
--- /dev/null
+++ b/src/main/java/net/fabricmc/loom/build/mixin/ScalaApInvoker.java
@@ -0,0 +1,50 @@
+/*
+ * This file is part of fabric-loom, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2016, 2017, 2018 FabricMC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package net.fabricmc.loom.build.mixin;
+
+import java.io.File;
+
+import com.google.common.collect.ImmutableList;
+import org.gradle.api.Project;
+import org.gradle.api.tasks.scala.ScalaCompile;
+
+public class ScalaApInvoker extends AnnotationProcessorInvoker<ScalaCompile> {
+	public ScalaApInvoker(Project project) {
+		super(project,
+						// Scala just uses the java AP configuration afaik. This of course assumes the java AP also gets configured.
+						ImmutableList.of(),
+						project.getTasks().withType(ScalaCompile.class));
+	}
+
+	@Override
+	protected void passArgument(ScalaCompile compileTask, String key, String value) {
+		compileTask.getOptions().getCompilerArgs().add("-A" + key + "=" + value);
+	}
+
+	@Override
+	protected File getDestinationDir(ScalaCompile task) {
+		return task.getDestinationDir();
+	}
+}