From 0a3b42d64942d3ce599b0865b9e422b85d78cca9 Mon Sep 17 00:00:00 2001
From: LepilkinaElena <Elena.Lepilkina@jetbrains.com>
Date: Wed, 13 May 2020 10:33:30 +0300
Subject: [PATCH] Save trove4j as separate jar (#4168)

---
 build.gradle      | 6 ++++++
 cmd/run_konan     | 3 ++-
 cmd/run_konan.bat | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 873db483b96..86eb3d86b0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -328,6 +328,8 @@ task shadowJar(type: ShadowJar) {
     mergeServiceFiles()
     destinationDirectory.set(file("$distDir/konan/lib"))
     archiveBaseName.set("kotlin-native")
+    // Exclude trove4j because of license agreement.
+    exclude "*trove4j*"
     configurations = [project.configurations.distPack]
     archiveClassifier.set(null)
     transform(CollisionTransformer.class) {
@@ -344,6 +346,10 @@ task distCompiler(type: Copy) {
         into('konan/nativelib')
     }
 
+    from(project(':backend.native').file('build/external_jars/trove4j.jar')) {
+        into('konan/lib')
+    }
+
     from(project(':Interop').file('Indexer/build/nativelibs')) {
         into('konan/nativelib')
     }
diff --git a/cmd/run_konan b/cmd/run_konan
index d8dad18b4c0..753468bde92 100755
--- a/cmd/run_konan
+++ b/cmd/run_konan
@@ -78,7 +78,8 @@ while IFS=$'\r' read -r line || [[ -n "$line" ]]; do
 done < "${KONAN_HOME}/tools/env_blacklist"
 
 KONAN_JAR="${KONAN_HOME}/konan/lib/kotlin-native.jar"
-KONAN_CLASSPATH="$KONAN_JAR"
+TROVE_JAR="${KONAN_HOME}/konan/lib/trove4j.jar"
+KONAN_CLASSPATH="$KONAN_JAR:$TROVE_JAR"
 TOOL_CLASS=org.jetbrains.kotlin.cli.utilities.MainKt
 LIBCLANG_DISABLE_CRASH_RECOVERY=1 \
 $TIMECMD "$JAVACMD" "${java_opts[@]}" "${java_args[@]}" -cp "$KONAN_CLASSPATH" "$TOOL_CLASS" "$TOOL_NAME" "${konan_args[@]}"
diff --git a/cmd/run_konan.bat b/cmd/run_konan.bat
index 909d722430f..6b9a02a22e0 100644
--- a/cmd/run_konan.bat
+++ b/cmd/run_konan.bat
@@ -55,8 +55,9 @@ set "NATIVE_LIB=%_KONAN_HOME%\konan\nativelib"
 set "KONAN_LIB=%_KONAN_HOME%\konan\lib"
 
 set "KONAN_JAR=%KONAN_LIB%\kotlin-native.jar"
+set TROVE_JAR="%KONAN_LIB%\trove4j.jar"
 
-set "KONAN_CLASSPATH=%KONAN_JAR%"
+set "KONAN_CLASSPATH=%KONAN_JAR%;%TROVE_JAR%"
 
 set JAVA_OPTS=-ea ^
     -Xmx3G ^