Replace SetProperty<Configuration> with ConfigurableFileCollection on ShadowJar

api/shadow.api

@@ -160,6 +160,7 @@ public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks
 	public abstract fun project (Ljava/lang/Object;)Lorg/gradle/api/specs/Spec;
 	public abstract fun resolve (Ljava/util/Collection;)Lorg/gradle/api/file/FileCollection;
 	public abstract fun resolve (Lorg/gradle/api/artifacts/Configuration;)Lorg/gradle/api/file/FileCollection;
+	public abstract fun resolve (Lorg/gradle/api/file/ConfigurableFileCollection;)Lorg/gradle/api/file/FileCollection;
 }
 
 public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter$AbstractDependencyFilter : com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter {
@@ -175,6 +176,7 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/Dependenc
 	public fun resolve (Ljava/util/Collection;)Lorg/gradle/api/file/FileCollection;
 	protected abstract fun resolve (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
 	public fun resolve (Lorg/gradle/api/artifacts/Configuration;)Lorg/gradle/api/file/FileCollection;
+	public fun resolve (Lorg/gradle/api/file/ConfigurableFileCollection;)Lorg/gradle/api/file/FileCollection;
 }
 
 public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/FindResourceInClasspath : org/gradle/api/DefaultTask, org/gradle/api/tasks/util/PatternFilterable {
@@ -225,7 +227,7 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar
 	public fun getAddMultiReleaseAttribute ()Lorg/gradle/api/provider/Property;
 	public fun getApiJars ()Lorg/gradle/api/file/ConfigurableFileCollection;
 	protected abstract fun getArchiveOperations ()Lorg/gradle/api/file/ArchiveOperations;
-	public fun getConfigurations ()Lorg/gradle/api/provider/SetProperty;
+	public fun getConfigurations ()Lorg/gradle/api/file/ConfigurableFileCollection;
 	public fun getDependencyFilter ()Lorg/gradle/api/provider/Property;
 	public fun getDuplicatesStrategy ()Lorg/gradle/api/file/DuplicatesStrategy;
 	public fun getEnableAutoRelocation ()Lorg/gradle/api/provider/Property;

docs/configuration/dependencies/README.md

@@ -9,15 +9,15 @@ merging can be configured using the [`configurations`][ShadowJar.configurations]
 
     ```kotlin
     tasks.shadowJar {
-      configurations = project.configurations.compileClasspath.map { listOf(it) }
+      configurations.setFrom(project.configurations.compileClasspath)
     }
     ```
 
 === "Groovy"
 
     ```groovy
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
-      configurations = project.configurations.named('compileClasspath').map { [it] }
+      configurations.setFrom project.configurations.named('compileClasspath')
     }
     ```
 
@@ -27,7 +27,7 @@ This means any dependency declared in the `runtimeOnly` configuration would be *
 
 > Note the literal use of [`project.configurations`][Project.configurations] when setting the
 > [`configurations`][ShadowJar.configurations] attribute of a [`ShadowJar`][ShadowJar] task.
-> This is **required**. It may be tempting to specify `configurations = [configurations.compileClasspath]` but this will
+> This is **required**. It may be tempting to specify `configurations.setFrom(configurations.compileClasspath)` but this will
 > not have the intended effect, as `configurations.compile` will try to delegate to the
 > [`configurations`][ShadowJar.configurations] property of the [`ShadowJar`][ShadowJar] task instead of the `project`
 

docs/configuration/relocation/README.md

@@ -227,7 +227,8 @@ relocating), you can try out the trick like:
     ```kotlin
     tasks.shadowJar {
       // Empty configurations list will exclude all dependencies.
-      configurations = emptyList()
+      configurations.unset()
+      configurations.unsetConvention()
       relocate("com.example", "shadow.com.example")
     }
     ```
@@ -237,7 +238,8 @@ relocating), you can try out the trick like:
     ```groovy
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       // Empty configurations list will exclude all dependencies.
-      configurations = []
+      configurations.unset()
+      configurations.unsetConvention()
       relocate 'com.example', 'shadow.com.example'
     }
     ```

docs/custom-tasks/README.md

@@ -13,7 +13,7 @@ the output.
 
       archiveClassifier = "test"
       from(sourceSets.test.map { it.output })
-      configurations = project.configurations.testRuntimeClasspath.map { listOf(it) }
+      configurations.setFrom(project.configurations.testRuntimeClasspath)
 
       manifest {
         // Optionally, set the main class for the JAR.
@@ -36,7 +36,7 @@ the output.
 
       archiveClassifier = 'test'
       from sourceSets.named('test').map { it.output }
-      configurations = project.configurations.named('testRuntimeClasspath').map { [it] }
+      configurations.setFrom project.configurations.named('testRuntimeClasspath')
 
       manifest {
         // Optionally, set the main class for the JAR.
@@ -67,7 +67,7 @@ source code. This is accomplished by creating a custom [`ShadowJar`][ShadowJar]
     tasks.registering(com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar::class) {
       description = "Create a shadow JAR of all dependencies"
       archiveClassifier = "dep"
-      configurations = project.configurations.runtimeClasspath.map { listOf(it) }
+      configurations.setFrom(project.configurations.runtimeClasspath)
     }
     ```
 
@@ -77,7 +77,7 @@ source code. This is accomplished by creating a custom [`ShadowJar`][ShadowJar]
     tasks.register('dependencyShadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       description = 'Create a shadow JAR of all dependencies'
       archiveClassifier = 'dep'
-      configurations = project.configurations.named('runtimeClasspath').map { [it] }
+      configurations.setFrom project.configurations.named('runtimeClasspath')
     }
     ```
 

docs/publishing/README.md

@@ -160,7 +160,7 @@ published artifact.
 No other dependencies are automatically configured for inclusion in the POM file.
 For example, excluded dependencies are **not** automatically added to the POM file or
 if the configuration for merging are modified by specifying
-`shadowJar.configurations = [configurations.myConfiguration]`, there is no automatic
+`shadowJar.configurations.setFrom(configurations.myConfiguration)`, there is no automatic
 configuration of the POM file.
 
 This automatic configuration occurs _only_ when using the above methods for
@@ -402,7 +402,7 @@ It is possible to publish a custom [`ShadowJar`][ShadowJar] task's output via th
       description = "Create a combined JAR of project and test dependencies"
       archiveClassifier = "tests"
       from(sourceSets.test.map { it.output })
-      configurations = project.configurations.testRuntimeClasspath.map { listOf(it) }
+      configurations.setFrom(project.configurations.testRuntimeClasspath)
     }
 
     dependencies {
@@ -434,7 +434,7 @@ It is possible to publish a custom [`ShadowJar`][ShadowJar] task's output via th
       description = 'Create a combined JAR of project and test dependencies'
       archiveClassifier = 'tests'
       from sourceSets.named('test').map { it.output }
-      configurations = project.configurations.named('testRuntimeClasspath').map { [it] }
+      configurations.setFrom project.configurations.named('testRuntimeClasspath')
     }
 
     dependencies {

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginsTest.kt

@@ -714,7 +714,7 @@ class JavaPluginsTest : BasePluginTest() {
           description = 'Create a combined JAR of project and test dependencies'
           archiveClassifier = 'test'
           from sourceSets.named('test').map { it.output }
-          configurations = project.configurations.named('testRuntimeClasspath').map { [it] }
+          configurations.setFrom project.configurations.named('testRuntimeClasspath')
           manifest {
             attributes '$mainClassAttributeKey': 'my.Main'
           }
@@ -751,7 +751,7 @@ class JavaPluginsTest : BasePluginTest() {
           description = 'Create a combined JAR of project and test dependencies'
           archiveClassifier = 'test'
           from sourceSets.named('test').map { it.output }
-          configurations = project.configurations.named('testRuntimeClasspath').map { [it] }
+          configurations.setFrom project.configurations.named('testRuntimeClasspath')
           manifest {
             attributes '$mainClassAttributeKey': 'my.Main'
           }
@@ -795,7 +795,7 @@ class JavaPluginsTest : BasePluginTest() {
         def $dependencyShadowJar = tasks.register('$dependencyShadowJar', ${ShadowJar::class.java.name}) {
           description = 'Create a shadow JAR of all dependencies'
           archiveClassifier = 'dep'
-          configurations = project.configurations.named('runtimeClasspath').map { [it] }
+          configurations.setFrom project.configurations.named('runtimeClasspath')
         }
       """
         .trimIndent()
@@ -1185,7 +1185,7 @@ class JavaPluginsTest : BasePluginTest() {
         }
 
         $shadowJarTask {
-          configurations = [project.configurations.runtimeClasspath]
+          configurations.setFrom project.configurations.runtimeClasspath
         }
 
         configurations.runtimeClasspath {

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt

@@ -305,7 +305,7 @@ class PublishingTest : BasePluginTest() {
             description = 'Create a combined JAR of project and test dependencies'
             archiveClassifier = 'tests'
             from sourceSets.named('test').map { it.output }
-            configurations = project.configurations.named('testRuntimeClasspath').map { [it] }
+            configurations.setFrom project.configurations.named('testRuntimeClasspath')
           }
         """
             .trimIndent(),

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt

@@ -466,7 +466,8 @@ class RelocationTest : BasePluginTest() {
           implementation 'junit:junit:3.8.2'
         }
         $shadowJarTask {
-          configurations = []
+          configurations.unset()
+          configurations.unsetConvention()
           relocate('', 'foo/')
         }
       """

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt

@@ -42,7 +42,7 @@ constructor(private val softwareComponentFactory: SoftwareComponentFactory) : Pl
     val taskProvider =
       registerShadowJarCommon(tasks.named("jar", Jar::class.java)) { task ->
         task.from(sourceSets.named("main").map { it.output })
-        task.configurations.convention(provider { listOf(runtimeConfiguration) })
+        task.configurations.convention(provider { runtimeConfiguration })
       }
     artifacts.add(configurations.shadow.name, taskProvider)
   }

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowKmpPlugin.kt

@@ -38,7 +38,7 @@ public abstract class ShadowKmpPlugin : Plugin<Project> {
       task.from(kotlinJvmMain.map { it.output.allOutputs })
       task.configurations.convention(
         provider {
-          listOf(configurations.getByName(kotlinJvmMain.get().runtimeDependencyConfigurationName))
+          configurations.getByName(kotlinJvmMain.get().runtimeDependencyConfigurationName)
         }
       )
 

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter.kt

@@ -7,6 +7,7 @@ import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.ResolvedArtifact
 import org.gradle.api.artifacts.ResolvedDependency
+import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.Provider
 import org.gradle.api.specs.Spec
@@ -22,6 +23,13 @@ public interface DependencyFilter : Serializable {
    */
   public fun resolve(configurations: Collection<Configuration>): FileCollection
 
+  /**
+   * Resolve a [ConfigurableFileCollection] against the [include]/[exclude] rules in the filter.
+   *
+   * Any [Configuration] sources within the collection are resolved individually and combined.
+   */
+  public fun resolve(configurations: ConfigurableFileCollection): FileCollection
+
   /** Exclude dependencies that match the provided [spec]. */
   public fun exclude(spec: Spec<ResolvedDependency>)
 
@@ -68,6 +76,24 @@ public interface DependencyFilter : Serializable {
         .reduceOrNull { acc, fileCollection -> acc + fileCollection } ?: project.files()
     }
 
+    override fun resolve(configurations: ConfigurableFileCollection): FileCollection {
+      val extracted = configurations.from.flatMap { source -> extractConfigurations(source) }
+      return resolve(extracted)
+    }
+
+    private fun extractConfigurations(source: Any): List<Configuration> =
+      when (source) {
+        is Configuration -> listOf(source)
+        is Provider<*> ->
+          when (val value = source.orNull) {
+            is Configuration -> listOf(value)
+            is Iterable<*> -> value.filterIsInstance<Configuration>()
+            else -> emptyList()
+          }
+        is Iterable<*> -> source.filterIsInstance<Configuration>()
+        else -> emptyList()
+      }
+
     override fun exclude(spec: Spec<ResolvedDependency>) {
       excludeSpecs.add(spec)
     }

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt

@@ -34,7 +34,6 @@ import org.apache.tools.zip.Zip64Mode
 import org.apache.tools.zip.ZipOutputStream
 import org.gradle.api.Action
 import org.gradle.api.Project
-import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.ArchiveOperations
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.CopySpec
@@ -101,7 +100,7 @@ public abstract class ShadowJar : Jar() {
   @get:Classpath
   public open val toMinimize: ConfigurableFileCollection = objectFactory.fileCollection {
     minimizeJar.map {
-      if (it) (dependencyFilterForMinimize.resolve(configurations.get()) - apiJars) else emptySet()
+      if (it) (dependencyFilterForMinimize.resolve(configurations) - apiJars) else emptySet()
     }
   }
 
@@ -137,7 +136,7 @@ public abstract class ShadowJar : Jar() {
    * Defaults to a set that contains `runtimeClasspath` or `runtime` configuration.
    */
   @get:Classpath
-  public open val configurations: SetProperty<Configuration> = objectFactory.setProperty()
+  public open val configurations: ConfigurableFileCollection = objectFactory.fileCollection()
 
   @get:Input
   public open val dependencyFilter: Property<DependencyFilter> =
@@ -146,7 +145,7 @@ public abstract class ShadowJar : Jar() {
   /** Final dependencies to be shadowed. */
   @get:Classpath
   public open val includedDependencies: ConfigurableFileCollection = objectFactory.fileCollection {
-    dependencyFilter.zip(configurations) { df, cs -> df.resolve(cs) }
+    dependencyFilter.map { df -> df.resolve(configurations) }
   }
 
   /**

src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPropertiesTest.kt

@@ -33,6 +33,7 @@ import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.JavaPlugin.API_CONFIGURATION_NAME
 import org.gradle.api.plugins.JavaPlugin.COMPILE_ONLY_API_CONFIGURATION_NAME
 import org.gradle.api.plugins.JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.TaskContainer
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.bundling.AbstractArchiveTask
@@ -154,7 +155,8 @@ class ShadowPropertiesTest {
         assertThat(mainClass.orNull).isNull()
 
         assertThat(relocationPrefix.get()).isEqualTo(ShadowBasePlugin.SHADOW)
-        assertThat(configurations.get()).containsOnly(runtimeConfiguration)
+        assertThat(configurations.from.map { (it as Provider<*>).get() })
+          .containsOnly(runtimeConfiguration)
       }
     }