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

// Conflicts:
//	src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt

Author: Goooler

docs/changes/README.md

@@ -16,6 +16,7 @@
   - `ShadowSpec` no longer extends `CopySpec`.
   - Overload `relocate`, `transform` and things for better usability in Kotlin.
 - **BREAKING CHANGE:** Remove redundant types from function returning. ([#1308](https://github.com/GradleUp/shadow/pull/1308))
+- `runShadow` no longer depends on `installShadowDist`. ([#1353](https://github.com/GradleUp/shadow/pull/1353))
 
 **Fixed**
 

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

@@ -43,9 +43,6 @@ class ApplicationPluginTest : BasePluginTest() {
           toolchain.languageVersion = JavaLanguageVersion.of(17)
         }
       """.trimIndent(),
-      applicationBlock = """
-        applicationDefaultJvmArgs = ['--add-opens=java.base/java.lang=ALL-UNNAMED']
-      """.trimIndent(),
       settingsBlock = """
         plugins {
           id 'org.gradle.toolchains.foojay-resolver-convention'
@@ -65,6 +62,17 @@ class ApplicationPluginTest : BasePluginTest() {
       "Hello, World! (foo) from Main",
       "Refs: junit.framework.Test",
     )
+  }
+
+  @Test
+  fun installShadowOutputs() {
+    prepare(
+      mainClassWithImports = true,
+      dependenciesBlock = "implementation 'junit:junit:3.8.2'",
+      applicationBlock = "applicationDefaultJvmArgs = ['--add-opens=java.base/java.lang=ALL-UNNAMED']",
+    )
+
+    run(installShadowDistTask)
 
     val installPath = path("build/install/")
     assertThat(installPath.walkEntries()).containsOnly(
@@ -106,7 +114,7 @@ class ApplicationPluginTest : BasePluginTest() {
   fun installShadowDoesNotExecuteDependentShadowTask() {
     prepare()
 
-    run(SHADOW_INSTALL_TASK_NAME)
+    run(installShadowDistTask)
 
     commonAssertions(jarPath("build/install/myapp-shadow/lib/myapp-1.0-all.jar"))
   }
@@ -134,9 +142,9 @@ class ApplicationPluginTest : BasePluginTest() {
       }
     }
 
-    assertions(run(runShadowTask).output, "foo")
+    assertions(run(runShadowTask, shadowJarTask).output, "foo")
     commonAssertions(
-      jarPath("build/install/myapp-shadow/lib/myapp-1.0-all.jar"),
+      jarPath("build/libs/myapp-1.0-all.jar"),
       entriesContained = entriesInA + arrayOf(mainClass, main2ClassEntry),
       mainClassAttr = "my.Main2",
     )

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

@@ -6,6 +6,7 @@ import assertk.assertThat
 import assertk.assertions.doesNotContain
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNotNull
+import com.github.jengelman.gradle.plugins.shadow.ShadowJavaAppPlugin.Companion.SHADOW_INSTALL_TASK_NAME
 import com.github.jengelman.gradle.plugins.shadow.ShadowJavaAppPlugin.Companion.SHADOW_RUN_TASK_NAME
 import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin.Companion.SHADOW_JAR_TASK_NAME
 import com.github.jengelman.gradle.plugins.shadow.internal.requireResourceAsPath
@@ -56,6 +57,7 @@ abstract class BasePluginTest {
   val shadowJarTask = ":$SHADOW_JAR_TASK_NAME"
   val serverShadowJarTask = ":server:$SHADOW_JAR_TASK_NAME"
   val runShadowTask = ":$SHADOW_RUN_TASK_NAME"
+  val installShadowDistTask = ":$SHADOW_INSTALL_TASK_NAME"
   val shadowDistZipTask = ":shadowDistZip"
 
   val projectScriptPath: Path get() = path("build.gradle")

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

@@ -23,6 +23,8 @@ import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator
  * A [Plugin] which packages and runs a project as a Java Application using the shadowed jar.
  *
  * Modified from [org.gradle.api.plugins.ApplicationPlugin.java](https://github.com/gradle/gradle/blob/45a20d82b623786d19b50185e595adf3d7b196b2/platforms/jvm/plugins-application/src/main/java/org/gradle/api/plugins/ApplicationPlugin.java).
+ *
+ * @see [ApplicationPlugin]
  */
 public abstract class ShadowJavaAppPlugin : Plugin<Project> {
   override fun apply(project: Project) {
@@ -38,10 +40,7 @@ public abstract class ShadowJavaAppPlugin : Plugin<Project> {
       task.description = "Runs this project as a JVM application using the shadow jar"
       task.group = ApplicationPlugin.APPLICATION_GROUP
 
-      val jarFile = tasks.installShadowDist.zip(tasks.shadowJar) { i, s ->
-        i.destinationDir.resolve("lib/${s.archiveFile.get().asFile.name}")
-      }
-      task.classpath(jarFile)
+      task.classpath = files(tasks.shadowJar)
 
       with(applicationExtension) {
         task.mainModule.set(mainModule)

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

@@ -29,7 +29,7 @@ public interface Relocator {
  * In other words, it has its appropriate inputs annotated so that Gradle can consider them when
  * determining the cache key.
  *
- * @see CacheableTransformer
+ * @see [CacheableTransformer]
  */
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.CLASS)

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

@@ -28,6 +28,8 @@ import org.objectweb.asm.commons.ClassRemapper
 
 /**
  * Modified from [org.gradle.api.internal.file.archive.ZipCopyAction.java](https://github.com/gradle/gradle/blob/b893c2b085046677cf858fb3d5ce00e68e556c3a/platforms/core-configuration/file-operations/src/main/java/org/gradle/api/internal/file/archive/ZipCopyAction.java).
+ *
+ * @see [org.gradle.api.internal.file.archive.ZipCopyAction]
  */
 public open class ShadowCopyAction(
   private val zipFile: File,

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

@@ -64,7 +64,7 @@ public interface ResourceTransformer {
  * In other words, it has its appropriate inputs annotated so that Gradle can consider them when
  * determining the cache key.
  *
- * @see CacheableRelocator
+ * @see [CacheableRelocator]
  */
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.CLASS)