From 56542286eb1159e5d0f9b2446b359f05b89b76b0 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 20 Nov 2017 17:00:29 +0100
Subject: [PATCH] Bring back filtering of jna and shading of jline in
 embeddable compiler

they were lost during the migration to gradle

(cherry picked from commit 126a6a8)
---
 buildSrc/src/main/kotlin/embeddable.kt       | 2 +-
 prepare/compiler-embeddable/build.gradle.kts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt
index 2b435b58e9d..06b66f443b5 100644
--- a/buildSrc/src/main/kotlin/embeddable.kt
+++ b/buildSrc/src/main/kotlin/embeddable.kt
@@ -18,7 +18,7 @@ val packagesToRelocate =
                 "org.apache",
                 "org.jdom",
                 "org.picocontainer",
-                "jline",
+                "org.jline",
                 "gnu",
                 "org.fusesource")
 
diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts
index 35f91d26420..29f312ea5d6 100644
--- a/prepare/compiler-embeddable/build.gradle.kts
+++ b/prepare/compiler-embeddable/build.gradle.kts
@@ -18,7 +18,9 @@ compilerDummyJar(compilerDummyForDependenciesRewriting("compilerDummy") {
     classifier = "dummy"
 })
 
-runtimeJar(embeddableCompiler())
+runtimeJar(embeddableCompiler()) {
+    exclude("com/sun/jna/**")
+}
 
 sourcesJar()
 javadocJar()