From 2427b51ba8b0b2f5db1a195f2b5d800ff10a853a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 23 Jun 2023 22:08:06 +0200 Subject: [PATCH] Relocate aalto-xml and stax2-api dependencies in embeddable compiler (KT-59631) Two additional dependencies were added during 213 platform migration: com.fasterxml:aalto-xml org.codehaus.woodstox:stax2-api Packages were not relocated and now might cause failures such as ``` Caused by: java.lang.NoSuchMethodError: 'void com.fasterxml.aalto.in.ReaderConfig.setXMLResolver(javax.xml.stream.XMLResolver)' ``` if proguard classes of kotlin-compiler-embeddable are registered early in the classpath. (cherry picked from commit d4c8636c70e7ae9138b1457e1d863c645752e9ef) --- buildSrc/src/main/kotlin/embeddable.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt index a309df08ca33e..01b75e78b4056 100644 --- a/buildSrc/src/main/kotlin/embeddable.kt +++ b/buildSrc/src/main/kotlin/embeddable.kt @@ -31,7 +31,9 @@ val packagesToRelocate = "net.jpountz", "one.util.streamex", "it.unimi.dsi.fastutil", - "kotlinx.collections.immutable" + "kotlinx.collections.immutable", + "com.fasterxml", + "org.codehaus" ) // The shaded compiler "dummy" is used to rewrite dependencies in projects that are used with the embeddable compiler