Merge remote-tracking branch 'origin/main' into g/20250311/kotlin-new-app-block

// Conflicts:
//	src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.kt

Author: Goooler

api/shadow.api

@@ -150,12 +150,9 @@ public class com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocat
 
 public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter : java/io/Serializable {
 	public abstract fun dependency (Ljava/lang/Object;)Lorg/gradle/api/specs/Spec;
-	public abstract fun dependency (Lorg/gradle/api/artifacts/Dependency;)Lorg/gradle/api/specs/Spec;
 	public abstract fun exclude (Lorg/gradle/api/specs/Spec;)V
 	public abstract fun include (Lorg/gradle/api/specs/Spec;)V
 	public abstract fun project (Ljava/lang/Object;)Lorg/gradle/api/specs/Spec;
-	public abstract fun project (Ljava/lang/String;)Lorg/gradle/api/specs/Spec;
-	public abstract fun project (Ljava/util/Map;)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;
 }

docs/changes/README.md

@@ -20,6 +20,10 @@
 
 - Fix relocation exclusion for file patterns like `kotlin/kotlin.kotlin_builtins`. ([#1313](https://github.com/GradleUp/shadow/pull/1313))
 
+**Removed**
+
+- **BREAKING CHANGE:** Reduce dependency and project overloads in `DependencyFilter`. ([#1328](https://github.com/GradleUp/shadow/pull/1328))
+
 
 ## [v9.0.0-beta10] (2025-03-05)
 

docs/configuration/dependencies/README.md

@@ -42,6 +42,7 @@ method can be used to add extra files.
       // Merge foo.jar (with unzipping) into the shadowed JAR.
       implementation(files("foo.jar"))
     }
+
     tasks.shadowJar {
       from("bar.jar") {
         // Copy bar.jar file (without unzipping) into META-INF/ in the shadowed JAR.
@@ -57,6 +58,7 @@ method can be used to add extra files.
       // Merge foo.jar (with unzipping) into the shadowed JAR.
       implementation files('foo.jar')
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       from('bar.jar') {
         // Copy bar.jar file (without unzipping) into META-INF/ in the shadowed JAR.
@@ -83,6 +85,7 @@ Gradle's `configurations` block.
     dependencies {
       implementation("org.apache.logging.log4j:log4j-core:2.11.1")
     }
+
     tasks.shadowJar {
       dependencies {
         exclude(dependency("org.apache.logging.log4j:log4j-core:2.11.1"))
@@ -96,6 +99,7 @@ Gradle's `configurations` block.
     dependencies {
       implementation 'org.apache.logging.log4j:log4j-core:2.11.1'
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       dependencies {
         exclude(dependency('org.apache.logging.log4j:log4j-core:2.11.1'))
@@ -109,6 +113,7 @@ Gradle's `configurations` block.
     dependencies {
       implementation(project(":api"))
     }
+
     tasks.shadowJar {
       dependencies {
         exclude(dependency(":api"))
@@ -122,6 +127,7 @@ Gradle's `configurations` block.
     dependencies {
       implementation project(':api')
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       dependencies {
         exclude(project(':api'))
@@ -145,6 +151,7 @@ using any of these individual fields.
     dependencies {
       implementation("org.apache.logging.log4j:log4j-core:2.11.1")
     }
+
     tasks.shadowJar {
       dependencies {
         exclude(dependency("org.apache.logging.log4j:log4j-core:.*"))
@@ -158,6 +165,7 @@ using any of these individual fields.
     dependencies {
       implementation 'org.apache.logging.log4j:log4j-core:2.11.1'
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       dependencies {
         exclude(dependency('org.apache.logging.log4j:log4j-core:.*'))
@@ -173,6 +181,7 @@ Any of the individual fields can be safely absent and will function as though a
     dependencies {
       implementation("org.apache.logging.log4j:log4j-core:2.11.1")
     }
+
     tasks.shadowJar {
       dependencies {
         exclude(dependency(":org.apache.logging.log4j:log4j-core"))
@@ -186,6 +195,7 @@ Any of the individual fields can be safely absent and will function as though a
     dependencies {
       implementation 'org.apache.logging.log4j:log4j-core:2.11.1'
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       dependencies {
         exclude(dependency('org.apache.logging.log4j:log4j-core'))
@@ -203,6 +213,7 @@ This same pattern can be used for any of the dependency notation fields.
     dependencies {
       implementation("org.apache.logging.log4j:log4j-core:2.11.1")
     }
+
     tasks.shadowJar {
       dependencies {
         exclude(dependency(":log4j-core:2.11.1"))
@@ -216,6 +227,7 @@ This same pattern can be used for any of the dependency notation fields.
     dependencies {
       implementation 'org.apache.logging.log4j:log4j-core:2.11.1'
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       dependencies {
         exclude(dependency(':log4j-core:2.11.1'))
@@ -229,6 +241,7 @@ This same pattern can be used for any of the dependency notation fields.
     dependencies {
       implementation("org.apache.logging.log4j:log4j-core:2.11.1")
     }
+
     tasks.shadowJar {
       dependencies {
         exclude(dependency("org.apache.logging.log4j:2.11.1"))
@@ -242,6 +255,7 @@ This same pattern can be used for any of the dependency notation fields.
     dependencies {
       implementation 'org.apache.logging.log4j:log4j-core:2.11.1'
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       dependencies {
         exclude(dependency('org.apache.logging.log4j:2.11.1'))
@@ -262,6 +276,7 @@ You can also use type-safe project accessors or version catalog accessors to fil
       // Have to enable `TYPESAFE_PROJECT_ACCESSORS` flag in your settings.gradle.kts
       implementation(projects.api)
     }
+
     tasks.shadowJar {
       dependencies {
         exclude(dependency(libs.log4j.core))
@@ -279,6 +294,7 @@ You can also use type-safe project accessors or version catalog accessors to fil
       // Have to enable `TYPESAFE_PROJECT_ACCESSORS` flag in your settings.gradle
       implementation projects.api
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       dependencies {
         exclude(dependency(libs.log4j.core))
@@ -299,6 +315,7 @@ block provides a method that accepts a `Closure` for selecting dependencies.
     dependencies {
       implementation("org.apache.logging.log4j:log4j-core:2.11.1")
     }
+
     tasks.shadowJar {
       dependencies {
         exclude {
@@ -314,6 +331,7 @@ block provides a method that accepts a `Closure` for selecting dependencies.
     dependencies {
       implementation 'org.apache.logging.log4j:log4j-core:2.11.1'
     }
+
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       dependencies {
         exclude {

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

@@ -53,10 +53,11 @@ public abstract class ShadowApplicationPlugin : Plugin<Project> {
           }
         }
       } else {
-        val extension = applicationExtension
-        task.mainModule.set(extension.mainModule)
-        task.mainClass.set(extension.mainClass)
-        task.jvmArguments.convention(provider { extension.applicationDefaultJvmArgs })
+        with(applicationExtension) {
+          task.mainModule.set(mainModule)
+          task.mainClass.set(mainClass)
+          task.jvmArguments.convention(provider { applicationDefaultJvmArgs })
+        }
       }
 
       task.modularity.inferModulePath.convention(javaPluginExtension.modularity.inferModulePath)
@@ -88,13 +89,14 @@ public abstract class ShadowApplicationPlugin : Plugin<Project> {
           }
         }
       } else {
-        val extension = applicationExtension
-        task.mainModule.set(extension.mainModule)
-        task.mainClass.set(extension.mainClass)
-        task.conventionMapping.map("applicationName", extension::getApplicationName)
-        task.conventionMapping.map("outputDir") { layout.buildDirectory.dir("scriptsShadow").get().asFile }
-        task.conventionMapping.map("executableDir", extension::getExecutableDir)
-        task.conventionMapping.map("defaultJvmOpts", extension::getApplicationDefaultJvmArgs)
+        with(applicationExtension) {
+          task.mainModule.set(mainModule)
+          task.mainClass.set(mainClass)
+          task.conventionMapping.map("applicationName", ::getApplicationName)
+          task.conventionMapping.map("outputDir") { layout.buildDirectory.dir("scriptsShadow").get().asFile }
+          task.conventionMapping.map("executableDir", ::getExecutableDir)
+          task.conventionMapping.map("defaultJvmOpts", ::getApplicationDefaultJvmArgs)
+        }
       }
 
       task.modularity.inferModulePath.convention(javaPluginExtension.modularity.inferModulePath)

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

@@ -47,42 +47,35 @@ internal sealed class AbstractDependencyFilter(
 
   override fun project(notation: Any): Spec<ResolvedDependency> {
     @Suppress("UNCHECKED_CAST")
-    return when (notation) {
-      is ProjectDependency -> dependency(notation)
-      is Provider<*> -> project(notation.get() as String)
-      is String -> project(notation)
-      is Map<*, *> -> project(notation as Map<String, *>)
-      else -> error("Unsupported notation type: ${notation::class.java}")
+    val realNotation = when (notation) {
+      is ProjectDependency -> return notation.toSpec()
+      is Provider<*> -> mapOf("path" to notation.get())
+      is String -> mapOf("path" to notation)
+      is Map<*, *> -> notation as Map<String, Any>
+      else -> throw IllegalArgumentException("Unsupported notation type: ${notation::class.java}")
     }
-  }
-
-  override fun project(notation: Map<String, *>): Spec<ResolvedDependency> {
-    return dependency(project.dependencies.project(notation))
-  }
-
-  override fun project(path: String): Spec<ResolvedDependency> {
-    return project(mapOf("path" to path))
+    return project.dependencies.project(realNotation).toSpec()
   }
 
   override fun dependency(dependencyNotation: Any): Spec<ResolvedDependency> {
     val realNotation = when (dependencyNotation) {
       is Provider<*> -> dependencyNotation.get()
       else -> dependencyNotation
     }
-    return dependency(project.dependencies.create(realNotation))
-  }
-
-  override fun dependency(dependency: Dependency): Spec<ResolvedDependency> {
-    return Spec<ResolvedDependency> { resolvedDependency ->
-      (dependency.group == null || resolvedDependency.moduleGroup.matches(dependency.group!!.toRegex())) &&
-        resolvedDependency.moduleName.matches(dependency.name.toRegex()) &&
-        (dependency.version == null || resolvedDependency.moduleVersion.matches(dependency.version!!.toRegex()))
-    }
+    return project.dependencies.create(realNotation).toSpec()
   }
 
   protected fun ResolvedDependency.isIncluded(): Boolean {
     val include = includeSpecs.isEmpty() || includeSpecs.any { it.isSatisfiedBy(this) }
     val exclude = excludeSpecs.isNotEmpty() && excludeSpecs.any { it.isSatisfiedBy(this) }
     return include && !exclude
   }
+
+  private fun Dependency.toSpec(): Spec<ResolvedDependency> {
+    return Spec<ResolvedDependency> { resolvedDependency ->
+      (group == null || resolvedDependency.moduleGroup.matches(group!!.toRegex())) &&
+        resolvedDependency.moduleName.matches(name.toRegex()) &&
+        (version == null || resolvedDependency.moduleVersion.matches(version!!.toRegex()))
+    }
+  }
 }

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

@@ -2,7 +2,6 @@ package com.github.jengelman.gradle.plugins.shadow.tasks
 
 import java.io.Serializable
 import org.gradle.api.artifacts.Configuration
-import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.ResolvedDependency
 import org.gradle.api.file.FileCollection
 import org.gradle.api.specs.Spec
@@ -34,23 +33,8 @@ public interface DependencyFilter : Serializable {
    */
   public fun project(notation: Any): Spec<ResolvedDependency>
 
-  /**
-   * Create a [Spec] that matches the provided project [notation].
-   */
-  public fun project(notation: Map<String, *>): Spec<ResolvedDependency>
-
-  /**
-   * Create a [Spec] that matches the provided project [path].
-   */
-  public fun project(path: String): Spec<ResolvedDependency>
-
   /**
    * Create a [Spec] that matches the provided [dependencyNotation].
    */
   public fun dependency(dependencyNotation: Any): Spec<ResolvedDependency>
-
-  /**
-   * Create a [Spec] that matches the provided [dependency].
-   */
-  public fun dependency(dependency: Dependency): Spec<ResolvedDependency>
 }