Defer more

GradleUp · Sep 13, 2024 · 028216d · 028216d
1 parent 36026ee
commit 028216d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy
@@ -30,7 +30,7 @@ class ShadowJavaPlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
-        def shadowTask = configureShadowTask(project)
+        def shadowTaskProvider = configureShadowTask(project)
 
         project.configurations.compileClasspath.extendsFrom project.configurations.shadow
 
@@ -44,12 +44,13 @@ class ShadowJavaPlugin implements Plugin<Project> {
                 it.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements, LibraryElements.JAR))
                 it.attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling, Bundling.SHADOWED))
             }
-            it.outgoing.artifact(shadowTask)
+            it.outgoing.artifact(shadowTaskProvider)
         }
 
-        AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.components.findByName("java")
-        javaComponent.addVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-            it.mapToOptional()
+        project.components.named("java") { AdhocComponentWithVariants it ->
+            it.addVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+                it.mapToOptional()
+            }
         }
 
         AdhocComponentWithVariants shadow = softwareComponentFactory.adhoc("shadow")
@@ -95,7 +96,7 @@ class ShadowJavaPlugin implements Plugin<Project> {
                                              project.configurations.runtimeClasspath : project.configurations.runtime]
             shadow.exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA', 'module-info.class')
         }
-        project.artifacts.add(ShadowBasePlugin.CONFIGURATION_NAME, taskProvider.get())
+        project.artifacts.add(ShadowBasePlugin.CONFIGURATION_NAME, taskProvider)
         return taskProvider
     }
 }