diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 6b05273ee8a..e3cb2e62487 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -16,6 +16,8 @@ val JDK_18: String by rootProject.extra val fatJarContents by configurations.creating val fatJarContentsStripMetadata by configurations.creating val fatJarContentsStripServices by configurations.creating +val fatJarContentsStripVersions by configurations.creating + val compilerVersion by configurations.creating // JPS build assumes fat jar is built from embedded configuration, @@ -26,6 +28,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { extendsFrom(fatJarContents) extendsFrom(fatJarContentsStripMetadata) extendsFrom(fatJarContentsStripServices) + extendsFrom(fatJarContentsStripVersions) extendsFrom(compilerVersion) } } @@ -211,13 +214,15 @@ dependencies { fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project) { - !(it.startsWith("jdom") || it.startsWith("log4j") || it.startsWith("trove4j")) + !(it.startsWith("jdom") || it.startsWith("log4j") || it.startsWith("trove4j") || it.startsWith("streamex")) } } fatJarContentsStripServices(jpsStandalone()) { includeJars("jps-model") } fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j" ) } + + fatJarContentsStripVersions(intellijCoreDep()) { includeJars("streamex", rootProject = rootProject) } } publish() @@ -245,6 +250,13 @@ val packCompiler by task { zipTree(it).matching { exclude("META-INF/jb/**", "META-INF/LICENSE") } } } + + dependsOn(fatJarContentsStripVersions) + from { + fatJarContentsStripVersions.files.map { + zipTree(it).matching { exclude("META-INF/versions/**") } + } + } } val proguard by task { diff --git a/prepare/compiler/compiler.pro b/prepare/compiler/compiler.pro index bab2a4bafb7..f1ab6a674de 100644 --- a/prepare/compiler/compiler.pro +++ b/prepare/compiler/compiler.pro @@ -37,14 +37,11 @@ -dontwarn javax.crypto.** -dontwarn java.lang.invoke.MethodHandle -dontwarn org.jline.builtins.Nano$Buffer --dontwarn org.jetbrains.annotations.ReadOnly --dontwarn org.jetbrains.annotations.Mutable -dontwarn com.intellij.util.io.TarUtil -dontwarn com.intellij.util.io.Compressor$Tar -# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations --dontwarn org.jetbrains.annotations.Async* --dontwarn org.jetbrains.annotations.Nls$Capitalization +# Some annotations from intellijCore/annotations.jar are not presented in org.jetbrains.annotations +-dontwarn org.jetbrains.annotations.* # Nullability annotations used in Guava -dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl