TODO and cleanups

GradleUp · Feb 7, 2025 · 66e849c · 66e849c
1 parent 2d399fa
commit 66e849c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/docs/changes/README.md b/src/docs/changes/README.md
@@ -6,7 +6,7 @@
 **Added**
 
 - Sync `ShadowApplicationPlugin` with `ApplicationPlugin`. ([#1224](https://github.com/GradleUp/shadow/pull/1224))
-- Inject `Multi-Release` attribute if any dependency contains it. ([#1239](https://github.com/GradleUp/shadow/pull/1239))
+- Inject `Multi-Release` manifest attribute if any dependency contains it. ([#1239](https://github.com/GradleUp/shadow/pull/1239))
 
 **Changed**
 

diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginTest.kt
@@ -12,6 +12,7 @@ import assertk.assertions.single
 import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin.Companion.SHADOW_JAR_TASK_NAME
 import com.github.jengelman.gradle.plugins.shadow.internal.classPathAttributeKey
 import com.github.jengelman.gradle.plugins.shadow.internal.mainClassAttributeKey
+import com.github.jengelman.gradle.plugins.shadow.internal.multiReleaseAttributeKey
 import com.github.jengelman.gradle.plugins.shadow.legacy.LegacyShadowPlugin
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.util.BooleanParameterizedTest
@@ -193,13 +194,13 @@ class JavaPluginTest : BasePluginTest() {
     "https://github.com/GradleUp/shadow/issues/449",
   )
   @Test
-  fun containsMultiReleaseAttrIfAnyDependencyContains() {
+  fun containsMultiReleaseAttrIfAnyDependencyContainsIt() {
     writeClientAndServerModules()
     path("client/build.gradle").appendText(
       """
         jar {
           manifest {
-            attributes 'Multi-Release': 'true'
+            attributes '$multiReleaseAttributeKey': 'true'
           }
         }
       """.trimIndent() + System.lineSeparator(),
@@ -209,7 +210,7 @@ class JavaPluginTest : BasePluginTest() {
 
     assertThat(outputServerShadowJar).useAll {
       transform { it.manifest.mainAttributes }.isNotEmpty()
-      getMainAttr("Multi-Release").isEqualTo("true")
+      getMainAttr(multiReleaseAttributeKey).isEqualTo("true")
     }
   }
 

diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt
@@ -265,7 +265,7 @@ public abstract class ShadowJar :
   @TaskAction
   override fun copy() {
     from(includedDependencies)
-    findAndAppendMultiReleaseAttr()
+    injectMultiReleaseAttrIfPresent()
     super.copy()
     logger.info(stats.toString())
   }
@@ -328,7 +328,8 @@ public abstract class ShadowJar :
       }
     }
 
-  private fun findAndAppendMultiReleaseAttr() {
+  private fun injectMultiReleaseAttrIfPresent() {
+    // TODO: https://github.com/GradleUp/shadow/pull/1239#discussion_r1946064032.
     val includeMultiReleaseAttr = includedDependencies.files.filter { it.extension == "jar" }
       .any {
         try {