Fix rebase errors

Author: Jan Diederich

gradle/dependencies.gradle

@@ -3,6 +3,7 @@ dependencies {
     shadow 'org.codehaus.groovy:groovy-backports-compat23:3.0.8'
 
     implementation 'org.jdom:jdom2:2.0.6.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'org.ow2.asm:asm:9.7'
     implementation 'org.ow2.asm:asm-commons:9.7'
     implementation 'commons-io:commons-io:2.16.1'

src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.groovy

@@ -19,10 +19,12 @@ import org.gradle.api.Action
 import org.gradle.api.GradleException
 import org.gradle.api.UncheckedIOException
 import org.gradle.api.file.FileCopyDetails
+import org.gradle.api.file.FilePermissions
 import org.gradle.api.file.FileTreeElement
 import org.gradle.api.file.RelativePath
 import org.gradle.api.internal.DocumentationRegistry
 import org.gradle.api.internal.file.CopyActionProcessingStreamAction
+import org.gradle.api.internal.file.DefaultFilePermissions
 import org.gradle.api.internal.file.DefaultFileTreeElement
 import org.gradle.api.internal.file.copy.CopyAction
 import org.gradle.api.internal.file.copy.CopyActionProcessingStream
@@ -43,7 +45,6 @@ import org.slf4j.LoggerFactory
 import javax.annotation.Nullable
 import java.util.zip.ZipException
 
-
 class ShadowCopyAction implements CopyAction {
     static final long CONSTANT_TIME_FOR_ZIP_ENTRIES = (new GregorianCalendar(1980, 1, 1, 0, 0, 0)).getTimeInMillis()
 
@@ -245,7 +246,7 @@ class ShadowCopyAction implements CopyAction {
         }
 
         private boolean recordVisit(FileCopyDetails fileCopyDetails) {
-            return recordVisit(fileCopyDetails.relativePath, fileCopyDetails.size, null)
+            return recordVisit(fileCopyDetails.relativePath.toString(), fileCopyDetails.size, null)
         }
 
         @Override
@@ -282,11 +283,11 @@ class ShadowCopyAction implements CopyAction {
             ZipFile archive = new ZipFile(fileDetails.file)
             try {
                 List<ArchiveFileTreeElement> archiveElements = archive.entries.collect {
-                    new ArchiveFileTreeElement(new RelativeArchivePath(it, fileDetails))
+                    new ArchiveFileTreeElement(new RelativeArchivePath(it))
                 }
                 Spec<FileTreeElement> patternSpec = patternSet.getAsSpec()
                 List<ArchiveFileTreeElement> filteredArchiveElements = archiveElements.findAll { ArchiveFileTreeElement archiveElement ->
-                    patternSpec.isSatisfiedBy(archiveElement)
+                    patternSpec.isSatisfiedBy(archiveElement.asFileTreeElement())
                 }
                 filteredArchiveElements.each { ArchiveFileTreeElement archiveElement ->
                     if (archiveElement.relativePath.file) {

src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.java

@@ -27,12 +27,14 @@
 import com.github.jengelman.gradle.plugins.shadow.transformers.StandardFilesMergeTransformer;
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer;
 import org.gradle.api.Action;
+import org.gradle.api.Task;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.DocumentationRegistry;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.file.copy.CopyAction;
+import org.gradle.api.specs.Spec;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -78,10 +80,9 @@ public ShadowJar() {
         super();
         setDuplicatesStrategy(
                 DuplicatesStrategy.INCLUDE); //shadow filters out files later. This was the default behavior in  Gradle < 6.x
-        versionUtil = new GradleVersionUtil(getProject().getGradle().getGradleVersion());
         dependencyFilter = new DefaultDependencyFilter(getProject());
         dependencyFilterForMinimize = new MinimizeDependencyFilter(getProject());
-        setManifest(new DefaultInheritManifest(getServices().get(FileResolver.class)));
+        setManifest(new DefaultInheritManifest(getProject(), getServices().get(FileResolver.class)));
         /*
          Add as default the StandardFilesMergeTransformer, remove it with "removeDefaultTransformers()".
          This is added by default, because otherwise:
@@ -96,28 +97,20 @@ public ShadowJar() {
         relocators = new ArrayList<>();
         configurations = new ArrayList<>();
 
-        this.getInputs().property("minimize", new Callable<Boolean>() {
-            @Override
-            public Boolean call() throws Exception {
-                return minimizeJar;
-            }
-        });
+        this.getInputs().property("minimize", (Callable<Boolean>) () -> minimizeJar);
         this.getOutputs().doNotCacheIf("Has one or more transforms or relocators that are not cacheable",
-                new Spec<Task>() {
-                    @Override
-                    public boolean isSatisfiedBy(Task task) {
-                        for (Transformer transformer : transformers) {
-                            if (!isCacheableTransform(transformer.getClass())) {
-                                return true;
-                            }
+                task -> {
+                    for (Transformer transformer : transformers) {
+                        if (!isCacheableTransform(transformer.getClass())) {
+                            return true;
                         }
-                        for (Relocator relocator : relocators) {
-                            if (!isCacheableRelocator(relocator.getClass())) {
-                                return true;
-                            }
+                    }
+                    for (Relocator relocator : relocators) {
+                        if (!isCacheableRelocator(relocator.getClass())) {
+                            return true;
                         }
-                        return false;
                     }
+                    return false;
                 });
     }
 

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy

@@ -138,16 +138,15 @@ class ShadowPluginSpec extends PluginSpecification {
 
         buildFile << """
             |task shadow(type: ${ShadowJar.name}) {
-            |    destinationDir = buildDir
-            |    baseName = 'shadow'
+            |    destinationDirectory = buildDir
+            |    archiveBaseName = 'shadow'
             |    from('${artifact.path}')
             |    from('${project.path}')
             |}
         """.stripMargin()
 
         when:
-        runner.arguments << 'shadow'
-        ExecutionResult result = runner.run()
+        BuildResult result = run('shadow')
 
         then:
         assert result.output =~ /\s*IGNORING Weird-File\.StrangeFormat from test-project-1\.0-SNAPSHOT\.jar, size is different \([0-9]{4} vs [0-9]{2}\)\s+--> origin JAR was Weird-File.StrangeFormat/