Reduce nesting for Plugin.apply (#1407)

Author: Goooler

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

@@ -27,12 +27,12 @@ import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator
  * @see [ApplicationPlugin]
  */
 public abstract class ShadowApplicationPlugin : Plugin<Project> {
-  override fun apply(project: Project) {
-    project.addRunTask()
-    project.addCreateScriptsTask()
-    project.configureDistribution()
-    project.configureShadowJarMainClass()
-    project.configureInstallTask()
+  override fun apply(project: Project): Unit = with(project) {
+    addRunTask()
+    addCreateScriptsTask()
+    configureDistribution()
+    configureShadowJarMainClass()
+    configureInstallTask()
   }
 
   protected open fun Project.addRunTask() {

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

@@ -10,13 +10,13 @@ import org.gradle.util.GradleVersion
 
 public abstract class ShadowBasePlugin : Plugin<Project> {
 
-  override fun apply(project: Project) {
+  override fun apply(project: Project): Unit = with(project) {
     if (GradleVersion.current() < GradleVersion.version("8.3")) {
       throw GradleException("This version of Shadow supports Gradle 8.3+ only. Please upgrade.")
     }
     @Suppress("DEPRECATION")
-    project.extensions.create(EXTENSION_NAME, ShadowExtension::class.java, project)
-    project.configurations.create(CONFIGURATION_NAME)
+    extensions.create(EXTENSION_NAME, ShadowExtension::class.java, project)
+    configurations.create(CONFIGURATION_NAME)
   }
 
   public companion object {

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

@@ -31,11 +31,11 @@ public abstract class ShadowJavaPlugin @Inject constructor(
   private val softwareComponentFactory: SoftwareComponentFactory,
 ) : Plugin<Project> {
 
-  override fun apply(project: Project) {
-    project.configureShadowJar()
-    project.configureConfigurations()
-    project.configureComponents()
-    project.configureJavaGradlePlugin()
+  override fun apply(project: Project): Unit = with(project) {
+    configureShadowJar()
+    configureConfigurations()
+    configureComponents()
+    configureJavaGradlePlugin()
   }
 
   protected open fun Project.configureShadowJar() {

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

@@ -12,13 +12,11 @@ import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 public abstract class ShadowKmpPlugin : Plugin<Project> {
 
-  override fun apply(project: Project) {
-    with(project) {
-      extensions.getByType(KotlinMultiplatformExtension::class.java).targets.configureEach { target ->
-        if (target !is KotlinJvmTarget) return@configureEach
+  override fun apply(project: Project): Unit = with(project) {
+    extensions.getByType(KotlinMultiplatformExtension::class.java).targets.configureEach { target ->
+      if (target !is KotlinJvmTarget) return@configureEach
 
-        configureShadowJar(target)
-      }
+      configureShadowJar(target)
     }
   }
 

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

@@ -8,27 +8,25 @@ import org.gradle.api.plugins.JavaPlugin
 
 public abstract class ShadowPlugin : Plugin<Project> {
 
-  override fun apply(project: Project) {
-    with(project.plugins) {
-      apply(ShadowBasePlugin::class.java)
-      @Suppress("WithTypeWithoutConfigureEach")
-      withType(JavaPlugin::class.java) {
-        apply(ShadowJavaPlugin::class.java)
-      }
-      @Suppress("WithTypeWithoutConfigureEach")
-      withType(ApplicationPlugin::class.java) {
-        apply(ShadowApplicationPlugin::class.java)
-      }
-      withId("org.jetbrains.kotlin.multiplatform") {
-        apply(ShadowKmpPlugin::class.java)
-      }
-
-      // Apply the legacy plugin last.
-      // Because we apply the ShadowJavaPlugin/ShadowApplication plugin in a withType callback for the
-      // respective JavaPlugin/ApplicationPlugin, it may still apply before the shadowJar task is created etc.
-      // If the user applies shadow before those plugins. However, this is fine, because this was also
-      // the behavior with the old plugin when applying in that order.
-      apply(LegacyShadowPlugin::class.java)
+  override fun apply(project: Project): Unit = with(project.plugins) {
+    apply(ShadowBasePlugin::class.java)
+    @Suppress("WithTypeWithoutConfigureEach")
+    withType(JavaPlugin::class.java) {
+      apply(ShadowJavaPlugin::class.java)
+    }
+    @Suppress("WithTypeWithoutConfigureEach")
+    withType(ApplicationPlugin::class.java) {
+      apply(ShadowApplicationPlugin::class.java)
     }
+    withId("org.jetbrains.kotlin.multiplatform") {
+      apply(ShadowKmpPlugin::class.java)
+    }
+
+    // Apply the legacy plugin last.
+    // Because we apply the ShadowJavaPlugin/ShadowApplication plugin in a withType callback for the
+    // respective JavaPlugin/ApplicationPlugin, it may still apply before the shadowJar task is created etc.
+    // If the user applies shadow before those plugins. However, this is fine, because this was also
+    // the behavior with the old plugin when applying in that order.
+    apply(LegacyShadowPlugin::class.java)
   }
 }