From 5b32051c23685d55ed9a82baf52a121c236dbbcd Mon Sep 17 00:00:00 2001 From: solonovamax Date: Tue, 16 Jan 2024 17:01:38 -0500 Subject: [PATCH] Fix issues with shaded dependencies - Rely on fabric language kotlin to provide kotlinx.serialization - Relocate all shaded dependencies into subpackage Signed-off-by: solonovamax --- build.gradle.kts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8f67426..b4f53d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,7 +56,6 @@ dependencies { shadowDep("io.ktor:ktor-server-core-jvm:$ktor_version") shadowDep("io.ktor:ktor-server-cio-jvm:$ktor_version") shadowDep("io.ktor:ktor-server-cors-jvm:$ktor_version") - shadowDep("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_json_version") shadowDep("org.jetbrains.kotlin-wrappers:kotlin-css:$kotlin_css_version") } @@ -97,6 +96,15 @@ tasks { exclude(dependency("org.jetbrains.kotlinx:kotlinx-coroutines-.*")) exclude(dependency("org.slf4j:.*")) } + + fun relocate(origin: String) = relocate(origin, "littlechasiu.ctm.dependencies.$origin") + relocate("com.typesafe.config") + relocate("org.fusesource.jansi") + relocate("kotlinx.css") + relocate("io.ktor") + relocate("org.intellij.lang.annotations") + relocate("org.jetbrains.annotations") + configurations = listOf(shadowDep) duplicatesStrategy = DuplicatesStrategy.EXCLUDE }