Fix merge

GradleUp · Nov 4, 2024 · 962d35b · 962d35b
1 parent 180e173
commit 962d35b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/build-logic/src/main/kotlin/shadow.convention.publish.gradle.kts b/build-logic/src/main/kotlin/shadow.convention.publish.gradle.kts
@@ -45,8 +45,6 @@ configurations {
   listOf(
     apiElements,
     runtimeElements,
-    named("javadocElements"),
-    named("sourcesElements"),
   ).forEach {
     it.configure {
       outgoing {

diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.kt
@@ -11,13 +11,18 @@ public class ShadowPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     with(project.plugins) {
       apply(ShadowBasePlugin::class.java)
-      apply(LegacyShadowPlugin::class.java)
       withType(JavaPlugin::class.java) {
         apply(ShadowJavaPlugin::class.java)
       }
       withType(ApplicationPlugin::class.java) {
         apply(ShadowApplicationPlugin::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 and
+      //   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)
     }
   }
 }
diff --git a/...n/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerParameterTests.groovy b/...n/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerParameterTests.groovy
@@ -81,7 +81,7 @@ class ApacheNoticeResourceTransformerParameterTests extends TransformerTestSuppo
         try {
             final ByteArrayInputStream noticeInputStream = new ByteArrayInputStream(noticeText.getBytes())
             final List<Relocator> emptyList = Collections.emptyList()
-            subject.transform(TransformerContext.builder().path(NOTICE_RESOURCE).inputStream(noticeInputStream).relocators(emptyList).stats(stats).build())
+            transformer.transform(TransformerContext.builder().path(NOTICE_RESOURCE).inputStream(noticeInputStream).relocators(emptyList).stats(stats).build())
         }
         catch (NullPointerException ignored) {
             fail("Null pointer should not be thrown when no parameters are set.")