Fix lz4 dependency...

after snappy was replaced by lz4 in the platform (see the previous commit
with related test for the more info)
This commit is contained in:
Ilya Chernikov
2018-05-11 14:16:05 +02:00
parent 38ffd6f85e
commit c74924fb8c
3 changed files with 5 additions and 3 deletions
+2 -1
View File
@@ -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.* { *; }
+2 -1
View File
@@ -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.* { *; }
+1 -1
View File
@@ -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") }
}