Merge pull request #826 from Goooler/replace_configure_util

Replace deprecated ConfigureUtil
GradleUp · Feb 27, 2023 · 49584a7 · 49584a7
2 parents 1a57c16 + b1d87c2
commit 49584a7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/docs/configuration/README.md b/src/docs/configuration/README.md
@@ -97,7 +97,7 @@ task testJar(type: Jar) {
 
 shadowJar {
   manifest {
-    inheritFrom project.tasks.testJar.manifest
+    inheritFrom(project, project.tasks.testJar.manifest)
   }
 }
 ```
diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy
@@ -68,7 +68,7 @@ class ShadowJavaPlugin implements Plugin<Project> {
                     }
                 }
             }
-            shadow.manifest.inheritFrom project.tasks.jar.manifest
+            shadow.manifest.inheritFrom(project, project.tasks.jar.manifest)
             def libsProvider = project.provider { -> [project.tasks.jar.manifest.attributes.get('Class-Path')] }
             def files = project.objects.fileCollection().from { ->
                 project.configurations.findByName(ShadowBasePlugin.CONFIGURATION_NAME)

diff --git a/...ain/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/DefaultInheritManifest.groovy b/...ain/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/DefaultInheritManifest.groovy
@@ -1,14 +1,14 @@
 package com.github.jengelman.gradle.plugins.shadow.tasks
 
 import org.gradle.api.Action
+import org.gradle.api.Project
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.api.java.archives.Attributes
 import org.gradle.api.java.archives.Manifest
 import org.gradle.api.java.archives.ManifestException
 import org.gradle.api.java.archives.ManifestMergeSpec
 import org.gradle.api.java.archives.internal.DefaultManifest
 import org.gradle.api.java.archives.internal.DefaultManifestMergeSpec
-import org.gradle.util.ConfigureUtil
 
 class DefaultInheritManifest implements InheritManifest {
 
@@ -23,16 +23,16 @@ class DefaultInheritManifest implements InheritManifest {
         this.fileResolver = fileResolver
     }
 
-    InheritManifest inheritFrom(Object... inheritPaths) {
-        inheritFrom(inheritPaths, null)
+    InheritManifest inheritFrom(Project project, Object... inheritPaths) {
+        inheritFrom(project, inheritPaths, null)
         return this
     }
 
-    InheritManifest inheritFrom(Object inheritPaths, Closure closure) {
+    InheritManifest inheritFrom(Project project, Object inheritPaths, Closure closure) {
         DefaultManifestMergeSpec mergeSpec = new DefaultManifestMergeSpec()
         mergeSpec.from(inheritPaths)
         inheritMergeSpecs.add(mergeSpec)
-        ConfigureUtil.configure(closure, mergeSpec)
+        project.configure(mergeSpec, closure)
         return this
     }
 

diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest.groovy
@@ -1,10 +1,11 @@
 package com.github.jengelman.gradle.plugins.shadow.tasks
 
+import org.gradle.api.Project
 import org.gradle.api.java.archives.Manifest
 
 interface InheritManifest extends Manifest {
 
-    InheritManifest inheritFrom(Object... inheritPaths)
+    InheritManifest inheritFrom(Project project, Object... inheritPaths)
 
-    InheritManifest inheritFrom(Object inheritPaths, Closure closure)
+    InheritManifest inheritFrom(Project project, Object inheritPaths, Closure closure)
 }