Merge pull request #112 from gradlex-org/project-isolation

Improve compatibility with Project Isolation
gradlex-org · Jun 4, 2024 · c3c8b51 · c3c8b51
2 parents 075ffd7 + fbb7826
commit c3c8b51
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Version 1.6.5
 * [#104](https://github.com/gradlex-org/java-module-dependencies/issues/104) Fix: ModuleDependencyReport task does not correctly track inputs
+* [#105](https://github.com/gradlex-org/java-module-dependencies/issues/105) Improve compatibility with Project Isolation
 
 ## Version 1.6.4
 * Enhance output of 'moduleDependencies' task

diff --git a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java
@@ -135,7 +135,7 @@ public abstract class JavaModuleDependenciesExtension {
     public JavaModuleDependenciesExtension(VersionCatalogsExtension versionCatalogs) {
         this.versionCatalogs = versionCatalogs;
         this.moduleInfoCache = getObjects().newInstance(ModuleInfoCache.class);
-        getModulesProperties().set(getProject().getRootProject().getLayout().getProjectDirectory().file("gradle/modules.properties"));
+        getModulesProperties().set(new File(getProject().getRootDir(), "gradle/modules.properties"));
         getVersionCatalogName().convention("libs");
         getModuleNameCheck().convention(true);
         getAnalyseOnly().convention(false);

diff --git a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleVersionsPlugin.java b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleVersionsPlugin.java
@@ -125,7 +125,7 @@ private void registerCatalogTask(Project project) {
 
             t.getEntries().addAll(collectCatalogEntriesFromVersions(javaModuleDependencies, moduleVersions));
             project.getRootProject().getSubprojects().forEach(sub -> {
-                File[] srcDirs = sub.getLayout().getProjectDirectory().dir("src").getAsFile().listFiles();
+                File[] srcDirs = sub.getProjectDir().listFiles();
                 (srcDirs == null ? Stream.<File>empty() : Arrays.stream(srcDirs)).forEach(srcDirSet -> {
                     File moduleInfoFile = new File(srcDirSet, "java/module-info.java");
                     if (!moduleInfoFile.exists()) {
@@ -144,7 +144,7 @@ private void registerCatalogTask(Project project) {
 
             t.getEntries().addAll();
 
-            t.getCatalogFile().set(project.getRootProject().getLayout().getProjectDirectory().file("gradle/libs.versions.toml"));
+            t.getCatalogFile().set(new File(project.getRootDir(), "gradle/libs.versions.toml"));
         });
     }
 

diff --git a/src/test/groovy/org/gradlex/javamodule/dependencies/test/CustomizationTest.groovy b/src/test/groovy/org/gradlex/javamodule/dependencies/test/CustomizationTest.groovy
@@ -63,7 +63,7 @@ class CustomizationTest extends Specification {
 
         appBuildFile << '''
             javaModuleDependencies {
-                modulesProperties.set(rootProject.layout.projectDirectory.file(".hidden/modules.properties"))
+                modulesProperties.set(File(rootDir,".hidden/modules.properties"))
             }
         '''
 

diff --git a/src/test/groovy/org/gradlex/javamodule/dependencies/test/GroupMappingTest.groovy b/src/test/groovy/org/gradlex/javamodule/dependencies/test/GroupMappingTest.groovy
@@ -34,7 +34,7 @@ class GroupMappingTest extends Specification {
         '''
 
         when:
-        def result = runner('assemble').build()
+        def result = runner(false, 'assemble').build()
 
         then:
         result.task(":app:compileJava").outcome == TaskOutcome.SUCCESS

diff --git a/src/test/groovy/org/gradlex/javamodule/dependencies/test/LocalModuleMappingsTest.groovy b/src/test/groovy/org/gradlex/javamodule/dependencies/test/LocalModuleMappingsTest.groovy
@@ -51,6 +51,6 @@ class LocalModuleMappingsTest extends Specification {
         '''
 
         then:
-        build()
+        runner(false, 'build').build()
     }
 }
diff --git a/src/test/groovy/org/gradlex/javamodule/dependencies/test/RequiresRuntimeTest.groovy b/src/test/groovy/org/gradlex/javamodule/dependencies/test/RequiresRuntimeTest.groovy
@@ -157,12 +157,13 @@ class RequiresRuntimeTest extends Specification {
             tasks.compileTestJava {
                 classpath += sourceSets.main.get().output
                 
+                val srcDir = sourceSets.test.get().java.sourceDirectories.first()
                 options.compilerArgumentProviders.add {
                     listOf(
                         "--module-path",
                         classpath.files.joinToString(":"),
                         "--patch-module",
-                        "org.gradlex.test.app=" + sourceSets.test.get().java.sourceDirectories.first()
+                        "org.gradlex.test.app=" + srcDir
                     )
                 }
             }

diff --git a/src/test/groovy/org/gradlex/javamodule/dependencies/test/fixture/GradleBuild.groovy b/src/test/groovy/org/gradlex/javamodule/dependencies/test/fixture/GradleBuild.groovy
@@ -45,10 +45,12 @@ class GradleBuild {
                 mainClass.set("org.gradlex.test.app.Main")
             }
             tasks.register("printRuntimeJars") {
-                doLast { println(configurations.runtimeClasspath.get().files.map { it.name }) }
+                inputs.files(configurations.runtimeClasspath)
+                doLast { println(inputs.files.map { it.name }) }
             }
             tasks.register("printCompileJars") {
-                doLast { println(configurations.compileClasspath.get().files.map { it.name }) }
+                inputs.files(configurations.compileClasspath)
+                doLast { println(inputs.files.map { it.name }) }
             }
         '''
         libBuildFile << '''
@@ -85,12 +87,18 @@ class GradleBuild {
         runner('build').buildAndFail()
     }
 
-    GradleRunner runner(String... args) {
+    GradleRunner runner(boolean projectIsolation = true, String... args) {
+        List<String> latestFeaturesArgs = gradleVersionUnderTest || !projectIsolation? [] : [
+                '--configuration-cache',
+                '-Dorg.gradle.unsafe.isolated-projects=true',
+                // 'getGroup' in 'JavaModuleDependenciesExtension.create'
+                '--configuration-cache-problems=warn', '-Dorg.gradle.configuration-cache.max-problems=3'
+        ]
         GradleRunner.create()
                 .forwardOutput()
                 .withPluginClasspath()
                 .withProjectDir(projectDir)
-                .withArguments(Arrays.asList(args) + '-s' + '--warning-mode' + 'all')
+                .withArguments(Arrays.asList(args) + latestFeaturesArgs + '-s' + '--warning-mode=all')
                 .withDebug(ManagementFactory.getRuntimeMXBean().getInputArguments().toString().contains("-agentlib:jdwp")).with {
             gradleVersionUnderTest ? it.withGradleVersion(gradleVersionUnderTest) : it
         }