GradleUp · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025 · Jan 24, 2025
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -3,4 +3,7 @@
   extends: [
     'config:recommended',
   ],
+  "labels": [
+    "dependencies",
+  ],
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,11 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - yarn.lock
   pull_request:
+    paths-ignore:
+      - yarn.lock
   workflow_dispatch:
 
 jobs:

diff --git a/RELEASING.md b/RELEASING.md
@@ -12,28 +12,28 @@
 
 4. Commit
 
-   ```
-   $ git commit -am "Prepare version X.Y.Z"
+   ```sh
+   git commit -am "Prepare version X.Y.Z"
    ```
 
 5. Tag
 
-   ```
-   $ git tag -am "Version X.Y.Z" X.Y.Z
+   ```sh
+   git tag -am "Version X.Y.Z" X.Y.Z
    ```
 
 6. Update the `VERSION_NAME` in `gradle.properties` to the next "SNAPSHOT" version.
 
 7. Commit
 
-   ```
-   $ git commit -am "Prepare next development version"
+   ```sh
+   git commit -am "Prepare next development version"
    ```
 
 8. Push!
 
-   ```
-   $ git push && git push --tags
+   ```sh
+   git push && git push --tags
    ```
 
    This will trigger a GitHub Action workflow which will create a GitHub release and upload the

diff --git a/api/shadow.api b/api/shadow.api
@@ -4,17 +4,18 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/ShadowApplicati
 	public static final field SHADOW_RUN_TASK_NAME Ljava/lang/String;
 	public static final field SHADOW_SCRIPTS_TASK_NAME Ljava/lang/String;
 	public fun <init> ()V
-	protected fun addCreateScriptsTask ()V
-	protected fun addRunTask ()V
+	protected fun addCreateScriptsTask (Lorg/gradle/api/Project;)V
+	protected fun addRunTask (Lorg/gradle/api/Project;)V
 	public synthetic fun apply (Ljava/lang/Object;)V
 	public fun apply (Lorg/gradle/api/Project;)V
-	protected fun configureDistSpec ()V
-	protected fun configureInstallTask ()V
-	protected fun configureJarMainClass ()V
-	protected final fun getShadowJar ()Lorg/gradle/api/tasks/TaskProvider;
+	protected fun configureDistSpec (Lorg/gradle/api/Project;)V
+	protected fun configureInstallTask (Lorg/gradle/api/Project;)V
+	protected fun configureJarMainClass (Lorg/gradle/api/Project;)V
 }
 
 public final class com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin$Companion {
+	public final fun getInstallShadowDist (Lorg/gradle/api/tasks/TaskContainer;)Lorg/gradle/api/tasks/TaskProvider;
+	public final fun getStartShadowScripts (Lorg/gradle/api/tasks/TaskContainer;)Lorg/gradle/api/tasks/TaskProvider;
 }
 
 public abstract class com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugin : org/gradle/api/Plugin {
@@ -31,6 +32,7 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugi
 }
 
 public final class com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugin$Companion {
+	public final fun getShadow (Lorg/gradle/api/artifacts/ConfigurationContainer;)Lorg/gradle/api/NamedDomainObjectProvider;
 }
 
 public abstract class com/github/jengelman/gradle/plugins/shadow/ShadowExtension {
@@ -45,9 +47,15 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugi
 	public fun <init> (Lorg/gradle/api/component/SoftwareComponentFactory;)V
 	public synthetic fun apply (Ljava/lang/Object;)V
 	public fun apply (Lorg/gradle/api/Project;)V
+	protected fun configureComponents (Lorg/gradle/api/Project;)V
+	protected fun configureConfigurations (Lorg/gradle/api/Project;)V
+	protected fun configureJavaGradlePlugin (Lorg/gradle/api/Project;)V
+	protected fun configureShadowJar (Lorg/gradle/api/Project;)V
 }
 
 public final class com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin$Companion {
+	public final fun getShadowJar (Lorg/gradle/api/tasks/TaskContainer;)Lorg/gradle/api/tasks/TaskProvider;
+	public final fun getShadowRuntimeElements (Lorg/gradle/api/artifacts/ConfigurationContainer;)Lorg/gradle/api/NamedDomainObjectProvider;
 }
 
 public abstract class com/github/jengelman/gradle/plugins/shadow/ShadowPlugin : org/gradle/api/Plugin {
@@ -91,8 +99,7 @@ public class com/github/jengelman/gradle/plugins/shadow/impl/RelocatorRemapper :
 	public fun mapValue (Ljava/lang/Object;)Ljava/lang/Object;
 }
 
-public abstract interface class com/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter {
-	public abstract fun dependency (Lgroovy/lang/Closure;)Lorg/gradle/api/specs/Spec;
+public abstract interface class com/github/jengelman/gradle/plugins/shadow/internal/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;)Lcom/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter;
@@ -226,12 +233,6 @@ public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks
 	public abstract fun inheritFrom ([Ljava/lang/Object;Lorg/gradle/api/Action;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest;
 }
 
-public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/JavaJarExec : org/gradle/api/tasks/JavaExec {
-	public fun <init> ()V
-	public fun exec ()V
-	public abstract fun getJarFile ()Lorg/gradle/api/file/RegularFileProperty;
-}
-
 public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/KnowsTask : org/gradle/api/DefaultTask {
 	public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/tasks/KnowsTask$Companion;
 	public static final field DESC Ljava/lang/String;
@@ -307,7 +308,9 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar
 	public fun getConfigurations ()Lorg/gradle/api/provider/SetProperty;
 	public fun getDependencyFilter ()Lorg/gradle/api/provider/Property;
 	public fun getEnableRelocation ()Lorg/gradle/api/provider/Property;
+	public fun getExcludes ()Ljava/util/Set;
 	public fun getIncludedDependencies ()Lorg/gradle/api/file/ConfigurableFileCollection;
+	public fun getIncludes ()Ljava/util/Set;
 	protected fun getInternalCompressor ()Lcom/github/jengelman/gradle/plugins/shadow/internal/ZipCompressor;
 	public fun getManifest ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest;
 	public synthetic fun getManifest ()Lorg/gradle/api/java/archives/Manifest;
@@ -316,7 +319,6 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar
 	public fun getRelocators ()Lorg/gradle/api/provider/SetProperty;
 	protected fun getRootPatternSet ()Lorg/gradle/api/tasks/util/PatternSet;
 	public fun getSourceSetsClassesDirs ()Lorg/gradle/api/file/ConfigurableFileCollection;
-	public fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
 	public fun getToMinimize ()Lorg/gradle/api/file/ConfigurableFileCollection;
 	public fun getTransformers ()Lorg/gradle/api/provider/SetProperty;
 	public fun mergeGroovyExtensionModules ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar;
@@ -353,7 +355,6 @@ public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks
 	public abstract fun append (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
 	public abstract fun append (Ljava/lang/String;Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
 	public abstract fun dependencies (Lorg/gradle/api/Action;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
-	public abstract fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
 	public abstract fun mergeGroovyExtensionModules ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
 	public abstract fun mergeServiceFiles ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
 	public abstract fun mergeServiceFiles (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
@@ -517,14 +518,15 @@ public class com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesF
 	public fun <init> (Lorg/gradle/api/model/ObjectFactory;)V
 	public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
 	public fun getCharsetName ()Lorg/gradle/api/provider/Property;
-	public fun getKeyTransformer ()Lorg/gradle/api/provider/Property;
+	public fun getKeyTransformer ()Lkotlin/jvm/functions/Function1;
 	public fun getMappings ()Lorg/gradle/api/provider/MapProperty;
 	public fun getMergeSeparator ()Lorg/gradle/api/provider/Property;
 	public fun getMergeStrategy ()Lorg/gradle/api/provider/Property;
 	public final fun getObjectFactory ()Lorg/gradle/api/model/ObjectFactory;
 	public fun getPaths ()Lorg/gradle/api/provider/SetProperty;
 	public fun hasTransformedResource ()Z
 	public fun modifyOutputStream (Lorg/apache/tools/zip/ZipOutputStream;Z)V
+	public fun setKeyTransformer (Lkotlin/jvm/functions/Function1;)V
 	public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
 }
 
@@ -630,8 +632,6 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Trans
 }
 
 public class com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
-	public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformer$Companion;
-	public static final field XSI_NS Ljava/lang/String;
 	public fun <init> (Lorg/gradle/api/model/ObjectFactory;)V
 	public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
 	public fun getIgnoreDtd ()Lorg/gradle/api/provider/Property;
@@ -642,6 +642,3 @@ public class com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendin
 	public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
 }
 
-public final class com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformer$Companion {
-}
-
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -105,8 +105,6 @@ testing.suites {
       }
     }
     dependencies {
-      // Seems we can't ref project() here due to some limitations of rootProject.
-      implementation(sourceSets.main.get().output)
       implementation(libs.apache.maven.modelBuilder)
       implementation(libs.moshi)
       implementation(libs.moshi.kotlin)
@@ -127,6 +125,15 @@ testing.suites {
   }
 }
 
+// This part should be placed after testing.suites to ensure the test sourceSets are created.
+kotlin.target.compilations {
+  val main by getting
+  val functionalTest by getting {
+    // TODO: https://youtrack.jetbrains.com/issue/KTIJ-7662
+    associateWith(main)
+  }
+}
+
 gradlePlugin {
   testSourceSets(
     sourceSets["functionalTest"],
@@ -145,6 +152,23 @@ tasks.check {
   dependsOn(tasks.withType<Test>())
 }
 
+tasks.register<Copy>("downloadStartScripts") {
+  description = "Download start scripts from Gradle sources, this should be run intervally to track updates."
+
+  val urlPrefix = "https://raw.githubusercontent.com/gradle/gradle/refs/heads/master/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins"
+  from(resources.text.fromUri("$urlPrefix/unixStartScript.txt")) {
+    rename { "unixStartScript.txt" }
+  }
+  from(resources.text.fromUri("$urlPrefix/windowsStartScript.txt")) {
+    rename { "windowsStartScript.txt" }
+  }
+  val destDir = file("src/main/resources/com/github/jengelman/gradle/plugins/shadow/internal")
+  if (!destDir.exists() || !destDir.isDirectory || destDir.listFiles().isNullOrEmpty()) {
+    error("Download destination dir $destDir does not exist or is empty.")
+  }
+  into(destDir)
+}
+
 tasks.clean {
   val includedBuilds = gradle.includedBuilds
   dependsOn(includedBuilds.map { it.task(path) })

diff --git a/gradle.properties b/gradle.properties
@@ -5,13 +5,13 @@ kotlin.stdlib.default.dependency=false
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.parallel=true
-org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx4g -XX:MaxMetaspaceSize=2g
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx4g
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 org.gradle.parallel=true
 
 GROUP=com.gradleup.shadow
 POM_ARTIFACT_ID=shadow-gradle-plugin
-VERSION_NAME=9.0.0-beta6
+VERSION_NAME=9.0.0-beta7
 
 SONATYPE_AUTOMATIC_RELEASE=true
 SONATYPE_HOST=DEFAULT

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ apache-commonsIo = "commons-io:commons-io:2.18.0"
 apache-log4j = "org.apache.logging.log4j:log4j-core:2.24.3"
 apache-maven-modelBuilder = "org.apache.maven:maven-model-builder:3.9.9"
 asm = "org.ow2.asm:asm-commons:9.7.1"
-jdependency = "org.vafer:jdependency:2.11"
+jdependency = "org.vafer:jdependency:2.12"
 jdom2 = "org.jdom:jdom2:2.0.6.1"
 plexus-utils = "org.codehaus.plexus:plexus-utils:4.0.2"
 plexus-xml = "org.codehaus.plexus:plexus-xml:4.0.4"
@@ -16,7 +16,7 @@ moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
 foojayResolver = "org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.9.0"
 
-pluginPublish = "com.gradle.publish:plugin-publish-plugin:1.3.0"
+pluginPublish = "com.gradle.publish:plugin-publish-plugin:1.3.1"
 mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.30.0"
 gitPublish = "org.ajoberstar.git-publish:gradle-git-publish:5.1.0"
 jetbrains-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
@@ -30,7 +30,7 @@ junit-bom = "org.junit:junit-bom:5.11.4"
 assertk = "com.willowtreeapps.assertk:assertk:0.28.1"
 
 [plugins]
-kotlin-jvm = "org.jetbrains.kotlin.jvm:2.1.0"
+kotlin-jvm = "org.jetbrains.kotlin.jvm:2.1.10"
 android-lint = "com.android.lint:8.8.0"
 jetbrains-bcv = "org.jetbrains.kotlinx.binary-compatibility-validator:0.17.0"
 spotless = "com.diffplug.spotless:7.0.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/docs/.vuepress/config.js b/src/docs/.vuepress/config.js
@@ -2,14 +2,14 @@ module.exports = {
   base: "/shadow/",
   dest: "build/site",
   ga: "UA-321220-4",
+  title: 'Gradle Shadow Plugin',
   themeConfig: {
     repo: "GradleUp/shadow",
     docsBranch: 'main',
     editLinks: true,
     editLinkText: 'Help improve these docs!',
     logo: '/logo+type.svg',
     docsDir: 'src/docs',
-    title: 'Gradle Shadow Plugin',
     nav: [
       { text: 'User Guide', link: '/introduction/' }
     ],

diff --git a/src/docs/application-plugin/README.md b/src/docs/application-plugin/README.md
@@ -40,7 +40,7 @@ application {
   mainClass = 'myapp.Main'
 }
 
-tasks.named('runShadow', com.github.jengelman.gradle.plugins.shadow.tasks.JavaJarExec) {
+tasks.named('runShadow', JavaExec) {
   args 'foo'
 }
 ```
@@ -55,3 +55,30 @@ the application.
 
 Additionally, the plugin will create the `installShadowDist` and `startShadowScripts` tasks which stages the necessary
 files for a distribution to `build/install/<project name>-shadow/`.
+
+You can also add more files into the distribution like:
+
+```groovy
+// Add extra files to the distribution
+plugins {
+  id 'java'
+  id 'application'
+  id 'com.gradleup.shadow'
+}
+
+application {
+  mainClass = 'myapp.Main'
+  // Optionally, you can add default JVM arguments to the start scripts like this:
+  applicationDefaultJvmArgs = ['--add-opens=java.base/java.lang=ALL-UNNAMED']
+}
+
+// `shadow` is the name of the distribution created by Shadow plugin
+distributions.named('shadow') {
+  contents.into('extra') {
+    from project.file('extra/echo.sh')
+  }
+}
+```
+
+View [the official doc described](https://docs.gradle.org/current/userguide/distribution_plugin.html#distribution_plugin)
+for more information about configuring distributions.