Remove a little bit more of the internal shadow APIs

Author: rtyler

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

@@ -1,11 +1,17 @@
 package com.github.jrubygradle.jar
 
-import com.github.jengelman.gradle.plugins.shadow.internal.GradleVersionUtil
+/*
+ * 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
 import groovy.transform.PackageScope
+import org.apache.tools.zip.ZipOutputStream
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.DuplicatesStrategy
@@ -15,6 +21,7 @@ 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
+import org.gradle.api.tasks.bundling.ZipEntryCompression
 
 /**
  * JRubyJar creates a Java Archive with Ruby code packed inside of it.
@@ -240,7 +247,6 @@ class JRubyJar extends Jar {
         appendix = 'jruby'
         /* Make sure our default configuration is present regardless of whether we use it or not */
         prepareTask = project.task("prepare${prepareNameForSuffix(name)}", type: JRubyPrepare)
-        versionUtil = new GradleVersionUtil(getProject().getGradle().getGradleVersion())
         dependsOn prepareTask
 
         // TODO get rid of this and try to adjust the CopySpec for the gems
@@ -297,7 +303,6 @@ class JRubyJar extends Jar {
                 [new JRubyDirInfoTransformer()], /* transformers */
                 [], /* relocators */
                 mainSpec.buildRootResolver().getPatternSet(), /* patternSet */
-                versionUtil, /* util */
                 false, /* preserveFileTimestamps */
                 false, /* minimizeJar */
                 null /* unusedTracker */
@@ -307,7 +312,14 @@ class JRubyJar extends Jar {
 
     @Internal
     protected ZipCompressor getInternalCompressor() {
-        return versionUtil.getInternalCompressor(getEntryCompression(), this)
+        switch (entryCompression) {
+            case ZipEntryCompression.DEFLATED:
+                return new DefaultZipCompressor(this.zip64, ZipOutputStream.DEFLATED)
+            case ZipEntryCompression.STORED:
+                return new DefaultZipCompressor(this.zip64, ZipOutputStream.STORED)
+            default:
+                throw new IllegalArgumentException(String.format('Unknown Compression type %s', entryCompression))
+        }
     }
 
     /**
@@ -329,5 +341,4 @@ class JRubyJar extends Jar {
     protected String embeddedJRubyMainsVersion = DEFAULT_JRUBY_MAINS
     protected String jarConfiguration = DEFAULT_JRUBYJAR_CONFIG
     protected String jarMainClass
-    protected GradleVersionUtil versionUtil
 }

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

@@ -7,7 +7,6 @@ package com.github.jrubygradle.jar.internal
 */
 
 import com.github.jengelman.gradle.plugins.shadow.impl.RelocatorRemapper
-import com.github.jengelman.gradle.plugins.shadow.internal.GradleVersionUtil
 import com.github.jengelman.gradle.plugins.shadow.internal.UnusedTracker
 import com.github.jengelman.gradle.plugins.shadow.internal.ZipCompressor
 import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
@@ -33,6 +32,7 @@ import org.gradle.api.internal.file.copy.CopyAction
 import org.gradle.api.internal.file.copy.CopyActionProcessingStream
 import org.gradle.api.internal.file.copy.FileCopyDetailsInternal
 import org.gradle.api.tasks.WorkResult
+import org.gradle.api.tasks.WorkResults
 import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.util.PatternSet
 import org.gradle.internal.UncheckedException
@@ -69,14 +69,13 @@ class JRubyJarCopyAction implements CopyAction {
     private final List<Relocator> relocators
     private final PatternSet patternSet
     private final String encoding
-    private final GradleVersionUtil versionUtil
     private final boolean preserveFileTimestamps
     private final boolean minimizeJar
     private final UnusedTracker unusedTracker
 
     JRubyJarCopyAction(File zipFile, ZipCompressor compressor, DocumentationRegistry documentationRegistry,
                             String encoding, List<Transformer> transformers, List<Relocator> relocators,
-                            PatternSet patternSet, GradleVersionUtil util,
+                            PatternSet patternSet,
                             boolean preserveFileTimestamps, boolean minimizeJar, UnusedTracker unusedTracker) {
 
         this.zipFile = zipFile
@@ -86,7 +85,6 @@ class JRubyJarCopyAction implements CopyAction {
         this.relocators = relocators
         this.patternSet = patternSet
         this.encoding = encoding
-        this.versionUtil = util
         this.preserveFileTimestamps = preserveFileTimestamps
         this.minimizeJar = minimizeJar
         this.unusedTracker = unusedTracker
@@ -141,7 +139,7 @@ class JRubyJarCopyAction implements CopyAction {
                 )
             }
         }
-        return versionUtil.getWorkResult(true)
+        return WorkResults.didWork(true)
     }
 
     private void processTransformers(ZipOutputStream stream) {