Merge pull request #356 from rtyler/shadow-307

Sync JRubyJarCopyAction with the upstream/originating shadow code

Author: rtyler

jar-plugin/build.gradle

@@ -17,7 +17,14 @@ generateTestConfig {
 
 dependencies {
     compile project(':jruby-gradle-plugin')
-    compile 'com.github.jengelman.gradle.plugins:shadow:[1.2.2,2.0)'  // NEED TO FIX THIS OPEN END
+    /*
+     * NOTE: version 5.0.0 of the shadow plugin supports only Gradle 5.x and later
+     */
+    compile 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
+    compile 'org.codehaus.plexus:plexus-utils:[3.2.0,3.3)'
+    compile 'org.apache.commons:commons-io:1.3.2'
+    compile 'org.ow2.asm:asm-commons:[6.1,6.99)'
+    compile 'org.apache.ant:ant:[1.10.6,2.0)'
 
     testCompile (spockVersion) {
         exclude module : 'groovy-all'

jar-plugin/src/main/groovy/com/github/jrubygradle/jar/JRubyJar.groovy

@@ -1,7 +1,12 @@
 package com.github.jrubygradle.jar
 
+/*
+ * These two internal imports from the Shadow plugin are unavoidable because of
+ * the expected internals of ShadowCopyAction
+ */
 import com.github.jengelman.gradle.plugins.shadow.internal.DefaultZipCompressor
 import com.github.jengelman.gradle.plugins.shadow.internal.ZipCompressor
+
 import com.github.jrubygradle.JRubyPrepare
 import com.github.jrubygradle.jar.internal.JRubyDirInfoTransformer
 import com.github.jrubygradle.jar.internal.JRubyJarCopyAction
@@ -12,6 +17,7 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.api.internal.file.copy.CopyAction
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.StopExecutionException
 import org.gradle.api.tasks.bundling.Jar
@@ -293,11 +299,18 @@ class JRubyJar extends Jar {
         return new JRubyJarCopyAction(getArchivePath(),
                 getInternalCompressor(),
                 null, /* DocumentationRegistry */
+                'utf-8', /* encoding */
                 [new JRubyDirInfoTransformer()], /* transformers */
                 [], /* relocators */
-                mainSpec.buildRootResolver().getPatternSet())
+                mainSpec.buildRootResolver().getPatternSet(), /* patternSet */
+                false, /* preserveFileTimestamps */
+                false, /* minimizeJar */
+                null /* unusedTracker */
+                )
+
     }
 
+    @Internal
     protected ZipCompressor getInternalCompressor() {
         switch (entryCompression) {
             case ZipEntryCompression.DEFLATED:

jar-plugin/src/main/groovy/com/github/jrubygradle/jar/internal/JRubyDirInfoTransformer.groovy

@@ -4,13 +4,13 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 
-import org.apache.tools.zip.ZipOutputStream
-import org.apache.tools.zip.ZipEntry
+import shadow.org.apache.tools.zip.ZipEntry
 import org.codehaus.plexus.util.IOUtil
 import org.gradle.api.file.FileTreeElement
 
-import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
+import shadow.org.apache.tools.zip.ZipOutputStream
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
 
 /**
  * JRubyDirInfoTransformer implements a {@link Transformer} interface.
@@ -44,7 +44,7 @@ class JRubyDirInfoTransformer implements Transformer {
     }
 
     /** No-op since we don't transform the actual file */
-    void transform(String path, InputStream is, List<Relocator> relocators) {
+    void transform(TransformerContext context) {
         return
     }
 
@@ -63,7 +63,7 @@ class JRubyDirInfoTransformer implements Transformer {
      * This method will also clean up our tempdir to make sure we don't
      * clutter the user's machine with junk
      */
-    void modifyOutputStream(ZipOutputStream os) {
+    void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) {
         processDirectory(os, tmpDir)
         deleteTempDirectory(tmpDir)
     }