Add bridge to 'requires runtime' feature of dependencies plugin

Needed for a correct whitebox testing setup.

Author: jjohannes

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Java Module Testing Gradle Plugin - Changelog
 
+## Version 1.1
+* Integrate with https://github.com/gradlex-org/java-module-dependencies/issues/19
+
 ## Version 1.0
 * Moved project to [GradleX](https://gradlex.org) - new plugin ID: `org.gradlex.java-module-testing`
 

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "org.gradlex"
-version = "1.0"
+version = "1.1"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/use-all-java-module-plugins/build-logic/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation("org.gradlex:extra-java-module-info:1.0")
-    implementation("org.gradlex:java-module-dependencies:1.0")
-    implementation("org.gradlex:java-module-testing:1.0")
+    implementation("org.gradlex:extra-java-module-info:1.1")
+    implementation("org.gradlex:java-module-dependencies:1.2")
+    implementation("org.gradlex:java-module-testing:1.1")
 }

samples/use-only-java-module-testing-plugin/build-logic/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("org.gradlex:java-module-testing:1.0")
+    implementation("org.gradlex:java-module-testing:1.1")
 }

src/main/java/org/gradlex/javamodule/testing/JavaModuleTestingExtension.java

@@ -16,6 +16,7 @@
 
 package org.gradlex.javamodule.testing;
 
+import org.gradle.api.file.FileCollection;
 import org.gradlex.javamodule.testing.internal.ModuleInfoParser;
 import org.gradlex.javamodule.testing.internal.bridges.JavaModuleDependenciesBridge;
 import org.gradlex.javamodule.testing.internal.provider.WhiteboxTestCompileArgumentProvider;
@@ -134,14 +135,17 @@ private void configureJvmTestSuiteForWhitebox(JvmTestSuite jvmTestSuite, Whitebo
         SourceSet testSources = jvmTestSuite.getSources();
         tasks.named(testSources.getCompileJavaTaskName(), JavaCompile.class, compileJava -> {
             SourceSet sourcesUnderTest = whiteboxJvmTestSuite.getSourcesUnderTest().get();
+
             compileJava.setClasspath(sourcesUnderTest.getOutput().plus(configurations.getByName(testSources.getCompileClasspathConfigurationName())));
+            FileCollection syntheticModuleInfoFolders = JavaModuleDependenciesBridge.addRequiresRuntimeSupport(project, compileJava, sourcesUnderTest);
 
             WhiteboxTestCompileArgumentProvider argumentProvider = (WhiteboxTestCompileArgumentProvider) compileJava.getOptions().getCompilerArgumentProviders().stream()
                     .filter(p -> p instanceof WhiteboxTestCompileArgumentProvider).findFirst().orElseGet(() -> {
                         WhiteboxTestCompileArgumentProvider newProvider = new WhiteboxTestCompileArgumentProvider(
                                 sourcesUnderTest.getJava().getSrcDirs(),
                                 testSources.getJava().getSrcDirs(),
                                 compileJava,
+                                syntheticModuleInfoFolders,
                                 moduleDetector,
                                 moduleInfoParser);
                         compileJava.getOptions().getCompilerArgumentProviders().add(newProvider);

src/main/java/org/gradlex/javamodule/testing/internal/bridges/JavaModuleDependenciesBridge.java

@@ -17,8 +17,12 @@
 package org.gradlex.javamodule.testing.internal.bridges;
 
 import org.gradle.api.Project;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.compile.JavaCompile;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 public class JavaModuleDependenciesBridge {
@@ -31,7 +35,22 @@ public static Provider<?> gav(Project project, String moduleName) {
         try {
             Method gav = javaModuleDependencies.getClass().getMethod("gav", String.class);
             return (Provider<?>) gav.invoke(javaModuleDependencies, moduleName);
-        } catch (Exception e) {
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static FileCollection addRequiresRuntimeSupport(Project project, JavaCompile task, SourceSet sourceSet) {
+        Object javaModuleDependencies = project.getExtensions().findByName("javaModuleDependencies");
+        if (javaModuleDependencies == null) {
+            return project.getObjects().fileCollection();
+        }
+        try {
+            Method gav = javaModuleDependencies.getClass().getMethod("addRequiresRuntimeSupport", JavaCompile.class, SourceSet.class);
+            return (FileCollection) gav.invoke(javaModuleDependencies, task, sourceSet);
+        } catch (NoSuchMethodException e) {
+            return project.getObjects().fileCollection();
+        } catch (ReflectiveOperationException e) {
             throw new RuntimeException(e);
         }
     }

src/main/java/org/gradlex/javamodule/testing/internal/provider/WhiteboxTestCompileArgumentProvider.java

@@ -16,6 +16,7 @@
 
 package org.gradlex.javamodule.testing.internal.provider;
 
+import org.gradle.api.file.FileCollection;
 import org.gradlex.javamodule.testing.internal.ModuleInfoParser;
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.internal.jvm.JavaModuleDetector;
@@ -31,17 +32,19 @@ public class WhiteboxTestCompileArgumentProvider implements CommandLineArgumentP
     private final Set<File> mainSourceFolders;
     private final Set<File> testSourceFolders;
     private final JavaCompile task;
+    private final FileCollection syntheticModuleInfoFolders;
     private final JavaModuleDetector moduleDetector;
     private final ModuleInfoParser moduleInfoParser;
 
     private final List<String> allTestRequires = new ArrayList<>();
 
     public WhiteboxTestCompileArgumentProvider(
-            Set<File> mainSourceFolders, Set<File> testSourceFolders, JavaCompile task,
+            Set<File> mainSourceFolders, Set<File> testSourceFolders, JavaCompile task, FileCollection syntheticModuleInfoFolders,
             JavaModuleDetector moduleDetector, ModuleInfoParser moduleInfoParser) {
         this.mainSourceFolders = mainSourceFolders;
         this.testSourceFolders = testSourceFolders;
         this.task = task;
+        this.syntheticModuleInfoFolders = syntheticModuleInfoFolders;
         this.moduleDetector = moduleDetector;
         this.moduleInfoParser = moduleInfoParser;
     }
@@ -60,7 +63,8 @@ public Iterable<String> asArguments() {
 
         // Since for Gradle this sources set does not look like a module, we have to define the module path ourselves
         args.add("--module-path");
-        args.add(moduleDetector.inferModulePath(true, task.getClasspath()).getFiles().stream().map(File::getPath).collect(Collectors.joining(cpSeparator)));
+        args.add(moduleDetector.inferModulePath(true, task.getClasspath().plus(syntheticModuleInfoFolders)).getFiles().stream()
+                .map(File::getPath).collect(Collectors.joining(cpSeparator)));
 
         for (String testRequires : allTestRequires) {
             args.add("--add-modules");

src/test/groovy/org/gradlex/javamodule/testing/test/JavaModuleDependenciesBridgeTest.groovy

@@ -66,4 +66,40 @@ class JavaModuleDependenciesBridgeTest extends Specification {
         then:
         result.task(":app:test").outcome == TaskOutcome.SUCCESS
     }
+
+    def "compiles with provides runtime directives"() {
+        given:
+        appBuildFile << '''
+            dependencies.constraints {
+                javaModuleDependencies {
+                    implementation(gav("org.slf4j", "2.0.3"))
+                    implementation(gav("org.slf4j.simple", "2.0.3"))
+                }
+            }
+            javaModuleDependencies {
+                moduleNameToGA.put("com.example.lib", "com.example:lib")
+            }
+            javaModuleTesting.whitebox(testing.suites["test"]) {
+                requires.add("org.junit.jupiter.api")
+                requires.add("com.example.lib")
+                opensTo.add("org.junit.platform.commons")
+            }
+        '''
+        appModuleInfoFile << '''
+            module com.example.app {
+                requires org.slf4j;
+                requires /*runtime*/ org.slf4j.simple;
+            }
+        '''
+        libModuleInfoFile << '''
+            module com.example.lib { 
+            }
+        '''
+
+        when:
+        def result = runTests()
+
+        then:
+        result.task(":app:compileTestJava").outcome == TaskOutcome.SUCCESS
+    }
 }

src/test/groovy/org/gradlex/javamodule/testing/test/fixture/GradleBuild.groovy

@@ -29,7 +29,7 @@ class GradleBuild {
 
         settingsFile << '''
             pluginManagement {
-                plugins { id("org.gradlex.java-module-dependencies") version "1.0" }
+                plugins { id("org.gradlex.java-module-dependencies") version "1.2" }
             }
             dependencyResolutionManagement { repositories.mavenCentral() }
             includeBuild(".")