Take 'META-INF/versions' into account when calculating package names (#83)

Fixes #77

Author: jjohannes

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

@@ -58,6 +58,7 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -76,6 +77,7 @@
 public abstract class ExtraJavaModuleInfoTransform implements TransformAction<ExtraJavaModuleInfoTransform.Parameter> {
 
     private static final Pattern MODULE_INFO_CLASS_MRJAR_PATH = Pattern.compile("META-INF/versions/\\d+/module-info.class");
+    private static final Pattern MRJAR_VERSIONS_PATH = Pattern.compile("META-INF/versions/\\d+/(.*)/.*");
     private static final Pattern JAR_SIGNATURE_PATH = Pattern.compile("^META-INF/[^/]+\\.(SF|RSA|DSA|sf|rsa|dsa)$");
     private static final String SERVICES_PREFIX = "META-INF/services/";
 
@@ -280,7 +282,13 @@ private void copyAndExtractProviders(JarInputStream inputStream, JarOutputStream
                     if (entryName.endsWith(".class")) {
                         int i = entryName.lastIndexOf("/");
                         if (i > 0) {
-                            packages.add(entryName.substring(0, i));
+                            Matcher mrJarMatcher = MRJAR_VERSIONS_PATH.matcher(entryName);
+                            if (mrJarMatcher.matches()) {
+                                // Strip the 'META-INF/versions/11' part
+                                packages.add(mrJarMatcher.group(1));
+                            } else {
+                                packages.add(entryName.substring(0, i));
+                            }
                         }
                     }
                 }

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

@@ -1,5 +1,6 @@
 package org.gradlex.javamodule.moduleinfo.test
 
+import org.gradle.testkit.runner.TaskOutcome
 import org.gradlex.javamodule.moduleinfo.test.fixture.GradleBuild
 import org.gradlex.javamodule.moduleinfo.test.fixture.LegacyLibraries
 import spock.lang.Specification
@@ -139,4 +140,41 @@ class EdgeCasesFunctionalTest extends Specification {
         then:
         result.output.contains('[jsr305-3.0.2-module.jar]')
     }
+
+    def "can automatically export all packages of a multi-release legacy Jar"() {
+        given:
+        file("src/main/java/org/gradle/sample/app/Main.java") << """
+            package org.gradle.sample.app;
+            
+            import org.kohsuke.github.GHApp;
+            
+            public class Main {
+                public static void main(String[] args) {
+                    GHApp app = new GHApp();
+                }
+            }
+        """
+        file("src/main/java/module-info.java") << """
+            module org.gradle.sample.app {
+                exports org.gradle.sample.app;
+                
+                requires org.kohsuke.github;
+            }
+        """
+        buildFile << """          
+            dependencies {
+                implementation("org.kohsuke:github-api:1.317")
+            }
+            
+            extraJavaModuleInfo {
+                module("org.kohsuke:github-api", "org.kohsuke.github") {
+                    exportAllPackages()
+                    requires("org.apache.commons.lang3")
+                }
+            }
+        """
+
+        expect:
+        run().task(':run').outcome == TaskOutcome.SUCCESS
+    }
 }