From 847a214c4abe90079208e587440ac6d9c87ccbe3 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com> Date: Sat, 2 Sep 2023 17:09:12 +0300 Subject: [PATCH] Relocate serialization (#3607) Resolves #3479 --- gradle-plugins/compose/build.gradle.kts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts index 318f5206f2..7c32c4fef5 100644 --- a/gradle-plugins/compose/build.gradle.kts +++ b/gradle-plugins/compose/build.gradle.kts @@ -71,10 +71,12 @@ dependencies { embedded(project(":jdk-version-probe")) } +val packagesToRelocate = listOf("de.undercouch", "kotlinx.serialization") + val shadow = tasks.named("shadowJar") { - val fromPackage = "de.undercouch" - val toPackage = "org.jetbrains.compose.$fromPackage" - relocate(fromPackage, toPackage) + for (packageToRelocate in packagesToRelocate) { + relocate(packageToRelocate, "org.jetbrains.compose.internal.$packageToRelocate") + } archiveBaseName.set("shadow") archiveClassifier.set("") archiveVersion.set("")