fix: add default value for outputDirectory

eclipse-edc · Aug 21, 2024 · 29e2cd7 · 29e2cd7
1 parent cb190f9
commit 29e2cd7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/...todoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/AutodocDependencyInjector.java b/...todoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/AutodocDependencyInjector.java
@@ -47,10 +47,11 @@ public void beforeResolve(ResolvableDependencies dependencies) {
 
         if (addDependency(project, artifact)) {
             var task = project.getTasks().findByName("compileJava");
-            if ((task instanceof JavaCompile compileJava)) {
+            if (task instanceof JavaCompile compileJava) {
                 var versionArg = format("-A%s=%s", VERSION, project.getVersion());
                 var idArg = format("-A%s=%s:%s", ID, project.getGroup(), project.getName());
-                var outputArg = format("-A%s=%s", OUTPUTDIR, extension.getOutputDirectory().getOrNull());
+                var projectBuildDirectory = project.getLayout().getBuildDirectory().getAsFile();
+                var outputArg = format("-A%s=%s", OUTPUTDIR, extension.getOutputDirectory().convention(projectBuildDirectory).get());
 
                 compileJava.getOptions().getCompilerArgs().addAll(List.of(idArg, versionArg, outputArg));
             }

diff --git a/...utodoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/tasks/MergeManifestsTask.java b/...utodoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/tasks/MergeManifestsTask.java
@@ -37,7 +37,8 @@ public class MergeManifestsTask extends DefaultTask {
 
     public MergeManifestsTask() {
         appender = new JsonFileAppender(getProject().getLogger());
-        destinationFile = Path.of(getProject().getRootProject().getBuildDir().getAbsolutePath(), MERGED_MANIFEST_FILENAME).toFile();
+        var rootProjectPath = getProject().getRootProject().getLayout().getBuildDirectory().getAsFile().get().getAbsolutePath();
+        destinationFile = Path.of(rootProjectPath, MERGED_MANIFEST_FILENAME).toFile();
     }
 
 
@@ -48,12 +49,13 @@ public void mergeManifests() {
         Objects.requireNonNull(autodocExt, "AutodocExtension cannot be null");
 
         var destination = getDestinationFile();
-        var sourceFile = Path.of(autodocExt.getOutputDirectory().get().getAbsolutePath(), "edc.json").toFile();
 
         if (destination == null) {
             throw new GradleException("destinationFile must be configured but was null!");
         }
 
+        var projectBuildDirectory = getProject().getLayout().getBuildDirectory().getAsFile();
+        var sourceFile = Path.of(autodocExt.getOutputDirectory().convention(projectBuildDirectory).get().getAbsolutePath(), "edc.json").toFile();
         if (sourceFile.exists()) {
             appender.append(destination, sourceFile);
         } else {
@@ -84,4 +86,5 @@ public File getDestinationFile() {
     public void setDestinationFile(File destinationFile) {
         this.destinationFile = destinationFile;
     }
+
 }
diff --git a/...d/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/MavenArtifactConvention.java b/...d/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/MavenArtifactConvention.java
@@ -90,7 +90,8 @@ private void addArtifactIfExist(Project project, File location, MavenPublication
 
     private static @NotNull File getManifestFile(Project target) {
         var autodocExt = requireExtension(target, AutodocExtension.class);
-        var pathToManifest = autodocExt.getOutputDirectory().getOrElse(target.getLayout().getBuildDirectory().getAsFile().get()).getAbsolutePath();
+        var projectBuildDirectory = target.getLayout().getBuildDirectory().getAsFile();
+        var pathToManifest = autodocExt.getOutputDirectory().convention(projectBuildDirectory).get().getAbsolutePath();
         var manifestFileName = "edc.json";
         return Path.of(pathToManifest, manifestFileName).toFile();
     }