From bf1abed246758cd14086d4431f69606761bc274e Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 20 Nov 2020 15:46:34 +0300 Subject: [PATCH] Build: add shadowing processor for core.xml in embeddable compiler --- .../compiler/KotlinCoreEnvironment.kt.as42 | 2 +- prepare/compiler-embeddable/build.gradle.kts | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 index b1fc1f6e4c3..b41f8d46e03 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 @@ -686,4 +686,4 @@ class KotlinCoreEnvironment private constructor( } } } -} \ No newline at end of file +} diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index 496cc24eea3..4b1fb351605 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -1,3 +1,8 @@ +import java.util.stream.Collectors +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer +import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext +import shadow.org.apache.tools.zip.ZipEntry +import shadow.org.apache.tools.zip.ZipOutputStream description = "Kotlin Compiler (embeddable)" @@ -40,10 +45,42 @@ compilerDummyJar(compilerDummyForDependenciesRewriting("compilerDummy") { classifier = "dummy" }) +class CoreXmlShadingTransformer : Transformer { + companion object { + private const val XML_NAME = "META-INF/extensions/core.xml" + } + + private val content = StringBuilder() + + override fun canTransformResource(element: FileTreeElement): Boolean { + return (element.name == XML_NAME) + } + + override fun transform(context: TransformerContext) { + val text = context.`is`.bufferedReader().lines() + .map { it.replace("com.intellij.psi", "org.jetbrains.kotlin.com.intellij.psi") } + .collect(Collectors.joining("\n")) + content.appendln(text) + context.`is`.close() + } + + override fun hasTransformedResource(): Boolean { + return content.isNotEmpty() + } + + override fun modifyOutputStream(outputStream: ZipOutputStream, preserveFileTimestamps: Boolean) { + val entry = ZipEntry(XML_NAME) + outputStream.putNextEntry(entry) + outputStream.write(content.toString().toByteArray()) + } +} + val runtimeJar = runtimeJar(embeddableCompiler()) { exclude("com/sun/jna/**") exclude("org/jetbrains/annotations/**") mergeServiceFiles() + + transform(CoreXmlShadingTransformer::class.java) } sourcesJar()