Fix issue with ClojureScript output directory

ajoberstar · ajoberstar · commit 0c4e3a75e3c1 · 2023-04-21T00:08:53.000-05:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-import dev.clojurephant.plugin.clojure.tasks.ClojureCompile
 import org.gradle.plugins.ide.eclipse.model.EclipseModel
 
 plugins {
diff --git a/src/main/java/dev/clojurephant/plugin/clojurescript/ClojureScriptBasePlugin.java b/src/main/java/dev/clojurephant/plugin/clojurescript/ClojureScriptBasePlugin.java
@@ -82,7 +82,7 @@ private void configureBuildDefaults(Project project, SourceSetContainer sourceSe
     extension.getRootOutputDir().set(project.getLayout().getBuildDirectory().dir("clojurescript"));
 
     extension.getBuilds().configureEach(build -> {
-      build.getOutputDir().set(extension.getRootOutputDir().dir(build.getName()));
+      build.getOutputDir().convention(extension.getRootOutputDir().dir(build.getName()));
 
       build.getCompiler().getBaseOutputDirectory().set(build.getOutputDir());
       build.getCompiler().getModules().configureEach(module -> {
@@ -97,7 +97,7 @@ private void configureBuildDefaults(Project project, SourceSetContainer sourceSe
       String compileTaskName = build.getTaskName("compile");
       TaskProvider<ClojureScriptCompile> compileTask = project.getTasks().register(compileTaskName, ClojureScriptCompile.class, task -> {
         task.setDescription(String.format("Compiles the ClojureScript source for the %s build.", build.getName()));
-        task.getDestinationDir().set(build.getOutputDir());
+        task.getDestinationDir().set(build.getCompiler().getBaseOutputDirectory());
         task.setSource(build.getSourceTree());
         task.getClasspath().from(build.getSourceRoots());
         task.getClasspath().from(build.getClasspath());
diff --git a/src/main/java/dev/clojurephant/plugin/clojurescript/tasks/ClojureScriptCompileOptions.java b/src/main/java/dev/clojurephant/plugin/clojurescript/tasks/ClojureScriptCompileOptions.java
@@ -5,14 +5,10 @@
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.Console;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.Nested;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.*;
 
 public abstract class ClojureScriptCompileOptions {
-  @OutputDirectory
+  @Internal
   public abstract DirectoryProperty getBaseOutputDirectory();
 
   @Input

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import dev.clojurephant.plugin.clojure.tasks.ClojureCompile`
`2`	`1`	`import org.gradle.plugins.ide.eclipse.model.EclipseModel`
`3`	`2`
`4`	`3`	`plugins {`