diff --git a/compiler/compiler.pro b/compiler/compiler.pro index 962bf2cf30b..c1b25795690 100644 --- a/compiler/compiler.pro +++ b/compiler/compiler.pro @@ -47,7 +47,6 @@ messages/**) -dontwarn javax.crypto.** -dontwarn java.lang.invoke.MethodHandle -dontwarn org.jline.builtins.Nano$Buffer --dontwarn net.jpountz.lz4.LZ4Factory -dontwarn org.jetbrains.annotations.ReadOnly -dontwarn org.jetbrains.annotations.Mutable -dontwarn com.intellij.util.io.TarUtil @@ -216,3 +215,5 @@ messages/**) # remove when KT-18563 would be fixed -keep class org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt { *; } + +-keep class net.jpountz.lz4.* { *; } diff --git a/compiler/compiler.pro.182 b/compiler/compiler.pro.182 index eb42452a59a..d66e0cfb328 100644 --- a/compiler/compiler.pro.182 +++ b/compiler/compiler.pro.182 @@ -47,7 +47,6 @@ messages/**) -dontwarn javax.crypto.** -dontwarn java.lang.invoke.MethodHandle -dontwarn org.jline.builtins.Nano$Buffer --dontwarn net.jpountz.lz4.LZ4Factory -dontwarn org.jetbrains.annotations.ReadOnly -dontwarn org.jetbrains.annotations.Mutable -dontwarn com.intellij.util.io.TarUtil @@ -223,3 +222,5 @@ messages/**) # remove when KT-18563 would be fixed -keep class org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt { *; } + +-keep class net.jpountz.lz4.* { *; } diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 5855d87c110..4cd4e24d76c 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -71,7 +71,7 @@ dependencies { compile(project(":kotlin-reflect")) fatJarContents(intellijCoreDep()) { includeJars("intellij-core") } fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project, { !(it.startsWith("jdom") || it.startsWith("log4j")) }) } - fatJarContents(intellijDep()) { includeJars("jna-platform") } + fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-java-1.3") } fatJarContentsStripServices(intellijDep("jps-standalone")) { includeJars("jps-model") } fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j") } }