Support relocating Groovy extensions in Module descriptors (#1705)

* Relocate `extensionClasses` and `staticExtensionClasses`

* Update changelog

* Relocate `extensionModulePath`

* Test `groovyExtensionModuleTransformerWithRelocation`

* Revert "Relocate `extensionModulePath`"

This reverts commit 19be498

* Cleanup

Author: Goooler

docs/changes/README.md

@@ -5,6 +5,7 @@
 
 ### Added
 
+- Support relocating Groovy extensions in Module descriptors. ([#1705](https://github.com/GradleUp/shadow/pull/1705))
 - Add extensions for `Iterable<Relocator>`. ([#1710](https://github.com/GradleUp/shadow/pull/1710))
 
 ### Changed

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt

@@ -10,9 +10,11 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionMo
 import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer.Companion.MERGED_MODULE_VERSION
 import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer.Companion.PATH_GROOVY_EXTENSION_MODULE_DESCRIPTOR
 import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer.Companion.PATH_LEGACY_GROOVY_EXTENSION_MODULE_DESCRIPTOR
+import com.github.jengelman.gradle.plugins.shadow.util.JarPath
 import com.github.jengelman.gradle.plugins.shadow.util.getContent
 import java.nio.file.Path
 import kotlin.io.path.appendText
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
@@ -63,6 +65,35 @@ class GroovyExtensionModuleTransformerTest : BaseTransformerTest() {
     commonAssertions()
   }
 
+  @Test
+  fun groovyExtensionModuleTransformerWithRelocation() {
+    projectScript.appendText(
+      """
+        dependencies {
+          ${implementationFiles(buildJarFoo(), buildJarBar())}
+        }
+        $shadowJarTask {
+          relocate('com.acme', 'com.example.shaded.acme')
+          mergeGroovyExtensionModules()
+        }
+      """.trimIndent(),
+    )
+
+    run(shadowJarPath)
+
+    val properties = outputShadowedJar.extensionModuleProperties
+
+    assertThat(properties.getProperty(KEY_MODULE_NAME)).isEqualTo(MERGED_MODULE_NAME)
+    assertThat(properties.getProperty(KEY_MODULE_VERSION)).isEqualTo(MERGED_MODULE_VERSION)
+    assertThat(properties.getProperty(KEY_EXTENSION_CLASSES))
+      .isEqualTo(
+        "com.example.shaded.acme.foo.FooExtension,com.example.shaded.acme.foo.BarExtension," +
+          "com.example.shaded.acme.bar.SomeExtension,com.example.shaded.acme.bar.AnotherExtension",
+      )
+    assertThat(properties.getProperty(KEY_STATIC_EXTENSION_CLASSES))
+      .isEqualTo("com.example.shaded.acme.foo.FooStaticExtension,com.example.shaded.acme.bar.SomeStaticExtension")
+  }
+
   private fun buildJarFoo(
     entry: String = PATH_GROOVY_EXTENSION_MODULE_DESCRIPTOR,
   ): Path = buildJar("foo.jar") {
@@ -92,7 +123,7 @@ class GroovyExtensionModuleTransformerTest : BaseTransformerTest() {
   }
 
   private fun commonAssertions() {
-    val properties = outputShadowedJar.use { it.getContent(PATH_GROOVY_EXTENSION_MODULE_DESCRIPTOR) }.toProperties()
+    val properties = outputShadowedJar.extensionModuleProperties
 
     assertThat(properties.getProperty(KEY_MODULE_NAME)).isEqualTo(MERGED_MODULE_NAME)
     assertThat(properties.getProperty(KEY_MODULE_VERSION)).isEqualTo(MERGED_MODULE_VERSION)
@@ -108,6 +139,10 @@ class GroovyExtensionModuleTransformerTest : BaseTransformerTest() {
     const val STATIC_EXTENSION_CLASSES_FOO = "com.acme.foo.FooStaticExtension"
     const val STATIC_EXTENSION_CLASSES_BAR = "com.acme.bar.SomeStaticExtension"
 
+    val JarPath.extensionModuleProperties get() = use {
+      it.getContent(PATH_GROOVY_EXTENSION_MODULE_DESCRIPTOR).toProperties()
+    }
+
     @JvmStatic
     fun resourcePathProvider() = listOf(
       Arguments.of(PATH_LEGACY_GROOVY_EXTENSION_MODULE_DESCRIPTOR, PATH_LEGACY_GROOVY_EXTENSION_MODULE_DESCRIPTOR),

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

@@ -2,6 +2,7 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
 
 import com.github.jengelman.gradle.plugins.shadow.internal.inputStream
 import com.github.jengelman.gradle.plugins.shadow.internal.zipEntry
+import com.github.jengelman.gradle.plugins.shadow.relocation.relocateClass
 import java.util.Properties
 import org.apache.tools.zip.ZipOutputStream
 import org.gradle.api.file.FileTreeElement
@@ -45,8 +46,13 @@ public open class GroovyExtensionModuleTransformer : ResourceTransformer {
         }
         KEY_EXTENSION_CLASSES,
         KEY_STATIC_EXTENSION_CLASSES,
-        -> handle(key, value as String) { existingValue ->
-          module.setProperty(key, "$existingValue,$value")
+        -> {
+          val relocatedClasses = (value as String).split(',').joinToString(",") { className ->
+            context.relocators.relocateClass(className)
+          }
+          handle(key, relocatedClasses) { existingValue ->
+            module.setProperty(key, "$existingValue,$relocatedClasses")
+          }
         }
       }
     }