Support relocating Kotlin module files #1539

Goooler · 2025-07-23T09:41:02Z

Closes Automatically relocate package in Kotlin module files when moving packages #843.
Closes Relocation does not work properly for some method parameters #1427.
Closes Integrate this plugin into Shadow's codebase xpdustry/kotlin-shadow-relocator#30.
Closes Integrate this plugin into Shadow's codebase Spliterash/shadow-kotlin-relocate#1.

CHANGELOG's "Unreleased" section has been updated, if applicable.

https://github.com/xpdustry/kotlin-shadow-relocator/tree/b597930547718a9f7373cda2beabc6557da3e63d/src/main/kotlin/com/xpdustry/ksr

…otlin-metadata # Conflicts: # src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt

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

This reverts commit 874652f.

shanshin · 2025-09-12T13:35:15Z

The current implementation of KotlinModuleMetadata.read method checks the version of the metadata in loaded kotlin_module. And if its minor version is greater by 1 than the kotlin-metadata-jvm version, an error will be thrown.
E.g. for your current implementation kotlin_modules with metadata 2.4.0 will not be able to be processed.

Is such a restriction acceptable?

Goooler · 2025-09-12T13:53:29Z

Is such a restriction acceptable?

It's fair. The current relocation copies the original version, and the relocated module file will behave like the original one.

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

Line 266 in 909b066

val newKmMetadata = KotlinModuleMetadata(newKmModule, kmMetadata.version)

…otlin-metadata # Conflicts: # docs/changes/README.md

Goooler · 2025-09-18T02:27:24Z

Please take a look as soon as possible.

If the changes all look good to you, I'll merge this PR and release a new version.

…ks/ShadowCopyAction.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…shadow/RelocationTest.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Goooler force-pushed the g/20250723/relocate-kotlin-metadata branch 2 times, most recently from 3be4b4f to cd8664e Compare July 28, 2025 01:18

Goooler force-pushed the g/20250723/relocate-kotlin-metadata branch 9 times, most recently from c4c6449 to a0aa512 Compare August 14, 2025 09:09

Goooler force-pushed the g/20250723/relocate-kotlin-metadata branch 4 times, most recently from be60ca4 to 8d3ffe7 Compare August 21, 2025 09:58

Goooler mentioned this pull request Aug 21, 2025

Support Kotlin relocations #1680

Merged

Goooler force-pushed the g/20250723/relocate-kotlin-metadata branch from 8d3ffe7 to 8c9c78a Compare August 28, 2025 08:27

Goooler mentioned this pull request Aug 28, 2025

Prefer using when in visitFile #1697

Merged

Goooler force-pushed the g/20250723/relocate-kotlin-metadata branch from 9bd73e4 to 9c69246 Compare August 28, 2025 10:34

This was referenced Aug 28, 2025

Relocation does not work properly for some method parameters #1427

Closed

Automatically relocate package in Kotlin module files when moving packages #843

Closed

phinner and others added 3 commits August 30, 2025 19:09

Code landing and cleanups

8b438d9

https://github.com/xpdustry/kotlin-shadow-relocator/tree/b597930547718a9f7373cda2beabc6557da3e63d/src/main/kotlin/com/xpdustry/ksr

Reuse RelocationClassWriter

05a5f93

Port remapKotlinModule

5c3357d

Goooler force-pushed the g/20250723/relocate-kotlin-metadata branch from 9c69246 to 5c3357d Compare August 30, 2025 11:10

This was referenced Sep 1, 2025

Add the ability to rename annotations added by the Scala compiler. #756

Closed

Add extensions for Iterable<Relocator> #1710

Merged

Merge remote-tracking branch 'origin/main' into g/20250723/relocate-k…

8ce280a

…otlin-metadata # Conflicts: # src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt

Goooler force-pushed the g/20250723/relocate-kotlin-metadata branch 2 times, most recently from 04f6055 to 10e9904 Compare September 2, 2025 11:07

Goooler commented Sep 12, 2025

View reviewed changes

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt Show resolved Hide resolved

Goooler mentioned this pull request Sep 12, 2025

Register Moshi adapters for serialization and deserialization for KotlinModuleMetadata #1732

Closed

Goooler added 2 commits September 12, 2025 20:15

Revert "Use kotlin("metadata-jvm")"

69b7634

This reverts commit 874652f.

No need to relocated optionalAnnotationClasses

909b066

Test kotlin-stdlib.kotlin_module

2a49961

Update changelog

96224e8

This was referenced Sep 12, 2025

Integrate this plugin into Shadow's codebase Spliterash/shadow-kotlin-relocate#1

Closed

Deprecate Shadow plugin relocate extension for kotlin classes JetBrains/exposed-intellij-plugin#21

Open

Test relocating kotlin-reflect library #1695

Closed

Goooler added 2 commits September 16, 2025 14:57

Merge remote-tracking branch 'origin/main' into g/20250723/relocate-k…

1c10ae6

…otlin-metadata # Conflicts: # docs/changes/README.md

Fix merge

65ba6d6

Goooler added 2 commits September 19, 2025 13:28

Merge branch 'main' into g/20250723/relocate-kotlin-metadata

a33fa1e

Use OptIn

c5c71f1

Goooler requested a review from Copilot September 19, 2025 05:31

This comment was marked as outdated.

Sign in to view

Goooler and others added 3 commits September 19, 2025 13:35

Update src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tas…

3dca301

…ks/ShadowCopyAction.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update docs/changes/README.md

26a1337

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update relocateKotlinModuleFiles

22fc945

Goooler force-pushed the g/20250723/relocate-kotlin-metadata branch from 4ec8ec7 to 22fc945 Compare September 19, 2025 05:52

Goooler added 2 commits September 21, 2025 15:32

Merge branch 'main' into g/20250723/relocate-kotlin-metadata

fc75f60

Cleanup

d3215ec

Goooler enabled auto-merge (squash) September 21, 2025 07:35

Goooler requested a review from Copilot September 21, 2025 07:37

This comment was marked as outdated.

Sign in to view

Update src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/…

02160df

…shadow/RelocationTest.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Goooler merged commit 036feec into main Sep 21, 2025
10 checks passed

Goooler deleted the g/20250723/relocate-kotlin-metadata branch September 21, 2025 07:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Support relocating Kotlin module files #1539

Support relocating Kotlin module files #1539

Uh oh!

Goooler commented Jul 23, 2025 •

edited

Loading

Uh oh!

Uh oh!

shanshin commented Sep 12, 2025 •

edited

Loading

Uh oh!

Goooler commented Sep 12, 2025

Uh oh!

Goooler commented Sep 18, 2025

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Support relocating Kotlin module files #1539

Support relocating Kotlin module files #1539

Uh oh!

Conversation

Goooler commented Jul 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

shanshin commented Sep 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Goooler commented Sep 12, 2025

Uh oh!

Goooler commented Sep 18, 2025

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Goooler commented Jul 23, 2025 •

edited

Loading

shanshin commented Sep 12, 2025 •

edited

Loading