Fix requires scope calculation of 'requireAllDefinedDependencies' (#82)

Fixes #81

Author: jjohannes

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPlugin.java

@@ -184,6 +184,8 @@ private void registerTransform(String fileExtension, Project project, ExtraJavaM
                         toStringMap(sourceSets.stream().flatMap(s -> filteredResolutionResult(configurations.getByName(s.getCompileClasspathConfigurationName()), componentsOfInterest(extension))))));
                 p.getRuntimeClasspathDependencies().set(project.provider(() ->
                         toStringMap(sourceSets.stream().flatMap(s -> filteredResolutionResult(configurations.getByName(s.getRuntimeClasspathConfigurationName()), componentsOfInterest(extension))))));
+                p.getAnnotationProcessorClasspathDependencies().set(project.provider(() ->
+                        toStringMap(sourceSets.stream().flatMap(s -> filteredResolutionResult(configurations.getByName(s.getAnnotationProcessorConfigurationName()), componentsOfInterest(extension))))));
             });
             t.getFrom().attribute(artifactType, fileExtension).attribute(javaModule, false);
             t.getTo().attribute(artifactType, fileExtension).attribute(javaModule, true);

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoTransform.java

@@ -94,6 +94,8 @@ public interface Parameter extends TransformParameters {
         MapProperty<String, Set<String>> getCompileClasspathDependencies();
         @Input
         MapProperty<String, Set<String>> getRuntimeClasspathDependencies();
+        @Input
+        MapProperty<String, Set<String>> getAnnotationProcessorClasspathDependencies();
     }
 
     @InputArtifact
@@ -320,8 +322,9 @@ private byte[] addModuleInfo(ModuleInfo moduleInfo, Map<String, List<String>> pr
         if (moduleInfo.requireAllDefinedDependencies) {
             Set<String> compileDependencies = getParameters().getCompileClasspathDependencies().get().get(moduleInfo.getIdentifier());
             Set<String> runtimeDependencies = getParameters().getRuntimeClasspathDependencies().get().get(moduleInfo.getIdentifier());
+            Set<String> annotationProcessorDependencies = getParameters().getAnnotationProcessorClasspathDependencies().get().get(moduleInfo.getIdentifier());
 
-            if (compileDependencies == null && runtimeDependencies  == null) {
+            if (compileDependencies == null && runtimeDependencies == null && annotationProcessorDependencies == null) {
                 throw new RuntimeException("[requires directives from metadata] " +
                         "Cannot find dependencies for '" + moduleInfo.getModuleName() + "'. " +
                         "Are '" + moduleInfo.getIdentifier() + "' the correct component coordinates?");
@@ -333,17 +336,22 @@ private byte[] addModuleInfo(ModuleInfo moduleInfo, Map<String, List<String>> pr
             if (runtimeDependencies == null) {
                 runtimeDependencies = Collections.emptySet();
             }
+            if (annotationProcessorDependencies == null) {
+                annotationProcessorDependencies = Collections.emptySet();
+            }
             Set<String> allDependencies = new TreeSet<>();
             allDependencies.addAll(compileDependencies);
             allDependencies.addAll(runtimeDependencies);
+            allDependencies.addAll(annotationProcessorDependencies);
             for (String ga: allDependencies) {
                 String moduleName = gaToModuleName(ga);
-                if (compileDependencies.contains(ga) && runtimeDependencies.contains(ga)) {
-                    moduleVisitor.visitRequire(moduleName, Opcodes.ACC_TRANSITIVE, null);
-                } else if (runtimeDependencies.contains(ga)) {
-                    moduleVisitor.visitRequire(moduleName, 0, null);
-                } else if (compileDependencies.contains(ga)) {
+                if (compileDependencies.contains(ga) && !runtimeDependencies.contains(ga)) {
                     moduleVisitor.visitRequire(moduleName, Opcodes.ACC_STATIC_PHASE, null);
+                } else {
+                    // We can currently not identify for sure if a 'requires' is NOT transitive.
+                    // For that, we would need the 'compile classpath' of the module we are looking at right now.
+                    // The 'compileDependencies' set is based only on the 'compile classpath' of the final consumer.
+                    moduleVisitor.visitRequire(moduleName, Opcodes.ACC_TRANSITIVE, null);
                 }
             }
         }

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/RequireAllDefinedDependenciesFunctionalTest.groovy

@@ -295,4 +295,47 @@ class RequireAllDefinedDependenciesFunctionalTest extends Specification {
         fail().output.contains("[requires directives from metadata] " +
                 "The module name of the following component is not known: org.apache.httpcomponents:httpcore")
     }
+
+    def "requireAllDefinedDependencies work for annotation processor path"() {
+        given:
+        file("src/main/java/org/gradle/sample/app/Main.java") << """
+            package org.gradle.sample.app;
+
+            public class Main {
+                public static void main(String[] args) { }
+            }
+        """
+        file("src/main/java/module-info.java") << """
+            module org.gradle.sample.app {
+                exports org.gradle.sample.app;
+            }
+        """
+        buildFile << """          
+            dependencies {
+                annotationProcessor("com.google.auto.service:auto-service:1.1.1")
+            }
+            
+            dependencies.components {
+                withModule("com.google.guava:guava") {
+                    allVariants { withDependencies { removeAll { it.name != "failureaccess" } } }
+                }
+            }
+            
+            extraJavaModuleInfo {
+                automaticModule("com.google.auto.service:auto-service", "com.google.auto.service.processor")
+                automaticModule("com.google.auto:auto-common", "com.google.auto.common")
+                module("com.google.guava:guava", "com.google.common") {
+                    exportAllPackages()
+                    requireAllDefinedDependencies()
+                    requires("java.logging")
+                }
+                module("com.google.guava:failureaccess", "com.google.guava.failureaccess") {
+                    exportAllPackages()
+                }
+            }
+        """
+
+        expect:
+        run().task(':run').outcome == TaskOutcome.SUCCESS
+    }
 }