Register runShadow in afterEvaluate

Author: Goooler

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

@@ -292,7 +292,7 @@ class KotlinPluginsTest : BasePluginTest() {
       """.trimIndent(),
     )
 
-    val result = run(runShadowPath)
+    val result = run(runShadowPath, "--args='foo'")
 
     assertThat(result.output).contains(
       "Hello, World! (foo) from Main",

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

@@ -8,6 +8,7 @@ import com.github.jengelman.gradle.plugins.shadow.internal.javaPluginExtension
 import com.github.jengelman.gradle.plugins.shadow.internal.javaToolchainService
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar.Companion.shadowJar
 import java.io.IOException
+import org.gradle.api.Action
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -35,12 +36,7 @@ public abstract class ShadowApplicationPlugin : Plugin<Project> {
   }
 
   protected open fun Project.addRunTask() {
-    tasks.register(SHADOW_RUN_TASK_NAME, JavaExec::class.java) { task ->
-      task.description = "Runs this project as a JVM application using the shadow jar"
-      task.group = ApplicationPlugin.APPLICATION_GROUP
-
-      task.classpath = files(tasks.shadowJar)
-
+    registerRunShadowCommon { task ->
       with(applicationExtension) {
         task.mainModule.convention(mainModule)
         task.mainClass.convention(mainClass)
@@ -138,5 +134,16 @@ public abstract class ShadowApplicationPlugin : Plugin<Project> {
     @get:JvmSynthetic
     public inline val TaskContainer.installShadowDist: TaskProvider<Sync>
       get() = named(SHADOW_INSTALL_TASK_NAME, Sync::class.java)
+
+    internal fun Project.registerRunShadowCommon(
+      action: Action<JavaExec>,
+    ): TaskProvider<JavaExec> {
+      return tasks.register(SHADOW_RUN_TASK_NAME, JavaExec::class.java) { task ->
+        task.description = "Runs this project as a JVM application using the shadow jar"
+        task.group = ApplicationPlugin.APPLICATION_GROUP
+        task.classpath = files(tasks.shadowJar)
+        action.execute(task)
+      }
+    }
   }
 }

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

@@ -1,13 +1,11 @@
 package com.github.jengelman.gradle.plugins.shadow
 
-import com.github.jengelman.gradle.plugins.shadow.ShadowApplicationPlugin.Companion.SHADOW_RUN_TASK_NAME
+import com.github.jengelman.gradle.plugins.shadow.ShadowApplicationPlugin.Companion.registerRunShadowCommon
 import com.github.jengelman.gradle.plugins.shadow.internal.isAtLeastKgpVersion
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar.Companion.SHADOW_JAR_TASK_NAME
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar.Companion.registerShadowJarCommon
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar.Companion.shadowJar
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.plugins.ApplicationPlugin
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.bundling.Jar
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
@@ -27,7 +25,14 @@ public abstract class ShadowKmpPlugin : Plugin<Project> {
       }
 
       configureShadowJar(target)
-      addRunTask(target)
+    }
+
+    // TODO: https://youtrack.jetbrains.com/issue/KT-77499
+    afterEvaluate {
+      if (!isAtLeastKgpVersion(2, 1, 20)) return@afterEvaluate
+      @Suppress("EagerGradleConfiguration") // TODO: https://issuetracker.google.com/issues/444825893
+      val runJvmTask = tasks.findByName("runJvm") as? JavaExec ?: return@afterEvaluate
+      addRunTask(runJvmTask)
     }
   }
 
@@ -50,22 +55,14 @@ public abstract class ShadowKmpPlugin : Plugin<Project> {
     }
   }
 
-  private fun Project.addRunTask(target: KotlinJvmTarget) {
-    if (!isAtLeastKgpVersion(2, 1, 20)) return
-
-    tasks.register(SHADOW_RUN_TASK_NAME, JavaExec::class.java) { task ->
-      task.description = "Runs this project as a JVM application using the shadow jar"
-      task.group = ApplicationPlugin.APPLICATION_GROUP
-
-      task.classpath = files(tasks.shadowJar)
-
-      @OptIn(ExperimentalKotlinGradlePluginApi::class)
-      target.binaries {
-        executable { dsl ->
-          task.mainModule.set(dsl.mainModule)
-          task.mainClass.set(dsl.mainClass)
-          task.jvmArguments.convention(dsl.applicationDefaultJvmArgs)
-        }
+  private fun Project.addRunTask(runJvmTask: JavaExec) {
+    registerRunShadowCommon { task ->
+      with(runJvmTask) {
+        task.mainModule.convention(mainModule)
+        task.mainClass.convention(mainClass)
+        task.jvmArguments.convention(jvmArguments)
+        task.modularity.inferModulePath.convention(modularity.inferModulePath)
+        task.javaLauncher.convention(javaLauncher)
       }
     }
   }