Don't check for specific Shadow plugin id (fixes #36)

jpenilla · Mar 10, 2024 · b59f071 · b59f071
1 parent 4ea08c9
commit b59f071
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/plugin/src/main/kotlin/xyz/jpenilla/runtask/RunPlugin.kt b/plugin/src/main/kotlin/xyz/jpenilla/runtask/RunPlugin.kt
@@ -83,17 +83,20 @@ public abstract class RunPlugin : Plugin<Project> {
     }
   }
 
-  protected open fun findPluginJar(project: Project): Provider<RegularFile>? = when {
-    project.plugins.hasPlugin(Constants.Plugins.SHADOW_PLUGIN_ID) -> {
-      project.tasks.named<AbstractArchiveTask>(Constants.Plugins.SHADOW_JAR_TASK_NAME).flatMap { it.archiveFile }
-    }
-
-    else -> {
+  protected open fun findPluginJar(project: Project): Provider<RegularFile>? {
+    if (Constants.Plugins.SHADOW_JAR_TASK_NAME in project.tasks.names) {
       try {
-        project.tasks.named<AbstractArchiveTask>(JavaPlugin.JAR_TASK_NAME).flatMap { it.archiveFile }
-      } catch (ex: UnknownTaskException) {
-        null
+        return project.tasks.named<AbstractArchiveTask>(Constants.Plugins.SHADOW_JAR_TASK_NAME).flatMap { it.archiveFile }
+      } catch (ignore: Exception) {
       }
     }
+
+    return project.defaultJar()
+  }
+
+  private fun Project.defaultJar() = try {
+    project.tasks.named<AbstractArchiveTask>(JavaPlugin.JAR_TASK_NAME).flatMap { it.archiveFile }
+  } catch (ex: UnknownTaskException) {
+    null
   }
 }
diff --git a/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/Constants.kt b/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/Constants.kt
@@ -43,7 +43,6 @@ internal object Constants {
   const val USER_AGENT = "run-task"
 
   object Plugins {
-    const val SHADOW_PLUGIN_ID = "com.github.johnrengelman.shadow"
     const val SHADOW_JAR_TASK_NAME = "shadowJar"
 
     const val PAPERWEIGHT_USERDEV_PLUGIN_ID = "io.papermc.paperweight.userdev"