Merge pull request #28 from iherasymenko/jar-contents-copying

Correctly copy contents of JAR files on JDK < 16

Author: jjohannes

.github/workflows/build.yaml

@@ -1,10 +1,18 @@
 name: Build Plugin
-on: push
+on: [ push, pull_request ]
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        jdk: [ 11 ]
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.jdk }}
+          distribution: temurin
       - uses: eskatos/gradle-command-action@v1
         with:
           arguments: :build

src/functionalTest/groovy/de/jjohannes/gradle/javamodules/test/ExtraJavaModuleInfoTest.groovy

@@ -675,6 +675,58 @@ class ExtraJavaModuleInfoTest extends Specification {
         build().task(':compileJava').outcome == TaskOutcome.SUCCESS
     }
 
+    // See: https://github.com/jjohannes/extra-java-module-info/issues/27
+    def "correctly handles copying JAR contents on JDKs < 16"() {
+        given:
+        new File(testFolder.root, "src/main/java/org/gradle/sample/app/data").mkdirs()
+
+        testFolder.newFile("src/main/java/org/gradle/sample/app/Main.java") << """
+            package org.gradle.sample.app;
+            
+            public class Main {
+                public static void main(String[] args) {     
+                    System.out.println(org.w3c.css.sac.Parser.class);           
+                }
+            }
+        """
+
+        testFolder.newFile("src/main/java/module-info.java") << """
+            module org.gradle.sample.app {
+                requires sac;
+            }
+        """
+        testFolder.newFile("build.gradle.kts") << """
+            plugins {
+                application
+                id("de.jjohannes.extra-java-module-info")
+            }
+            
+            repositories {
+                mavenCentral()
+            }
+            
+            java {
+                modularity.inferModulePath.set(true)
+            }
+            
+            dependencies {
+                implementation("org.w3c.css:sac:1.3")    
+            }
+            
+            extraJavaModuleInfo {
+                automaticModule("sac-1.3.jar", "sac")
+            }
+            
+            application {
+                mainModule.set("org.gradle.sample.app")
+                mainClass.set("org.gradle.sample.app.Main")
+            }
+        """
+
+        expect:
+        build().task(':compileJava').outcome == TaskOutcome.SUCCESS
+    }
+
     BuildResult build() {
         gradleRunnerFor(['build']).build()
     }

src/main/java/de/jjohannes/gradle/javamodules/ExtraModuleInfoTransform.java

@@ -165,6 +165,7 @@ private static Map<String, String[]> copyAndExtractProviders(JarInputStream inpu
                 providers.put(entryName.substring(SERVICES_PREFIX.length()), extractImplementations(content));
             }
             if (!JAR_SIGNATURE_PATH.matcher(jarEntry.getName()).matches() && !"META-INF/MANIFEST.MF".equals(jarEntry.getName())) {
+                jarEntry.setCompressedSize(-1);
                 outputStream.putNextEntry(jarEntry);
                 outputStream.write(content);
                 outputStream.closeEntry();