From eefb880a65e7db96f9e157f44362f59813fcb47d Mon Sep 17 00:00:00 2001 From: Filipe Roque Date: Mon, 24 Mar 2025 09:37:23 +0000 Subject: [PATCH] Fixes support for Maven 4 immutable API --- src/it/test_no_sources/validate.groovy | 14 +++++++------- src/main/java/scala_maven/ScalaDocMojo.java | 6 ++---- .../java/scala_maven/ScalaTestCompileMojo.java | 6 ++---- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/it/test_no_sources/validate.groovy b/src/it/test_no_sources/validate.groovy index a122f21b..2fff8a00 100644 --- a/src/it/test_no_sources/validate.groovy +++ b/src/it/test_no_sources/validate.groovy @@ -1,11 +1,11 @@ -try { - def file = new File(basedir, 'target') -assert !file.exists() -return true +if (file.exists()){ + def targetEmpty = file.listFiles() + .findAll { it.name != "project-local-repo" } + .isEmpty() -} catch(Throwable e) { - e.printStackTrace() - return false + return targetEmpty } + +return true diff --git a/src/main/java/scala_maven/ScalaDocMojo.java b/src/main/java/scala_maven/ScalaDocMojo.java index 6366986f..9672cb42 100644 --- a/src/main/java/scala_maven/ScalaDocMojo.java +++ b/src/main/java/scala_maven/ScalaDocMojo.java @@ -64,12 +64,10 @@ public class ScalaDocMojo extends ScalaSourceMojoSupport implements MavenReport @Override protected List getSourceDirectories() throws Exception { - List sources = project.getCompileSourceRoots(); // Quick fix in case the user has not added the "add-source" goal. String scalaSourceDir = FileUtils.pathOf(sourceDir, useCanonicalPath); - if (!sources.contains(scalaSourceDir)) { - sources.add(scalaSourceDir); - } + project.addCompileSourceRoot(scalaSourceDir); + List sources = project.getCompileSourceRoots(); return normalize(sources); } diff --git a/src/main/java/scala_maven/ScalaTestCompileMojo.java b/src/main/java/scala_maven/ScalaTestCompileMojo.java index c6bc266b..e9051fbc 100644 --- a/src/main/java/scala_maven/ScalaTestCompileMojo.java +++ b/src/main/java/scala_maven/ScalaTestCompileMojo.java @@ -77,11 +77,9 @@ protected File getOutputDir() { @Override protected List getSourceDirectories() throws Exception { - List sources = project.getTestCompileSourceRoots(); String scalaSourceDir = testSourceDir.getAbsolutePath(); - if (!sources.contains(scalaSourceDir)) { - sources.add(scalaSourceDir); - } + project.addTestCompileSourceRoot(scalaSourceDir); + List sources = project.getTestCompileSourceRoots(); return normalize(sources); }