From 63a396b51dd5d25d2a0ebca9c195fb4d39f21f0f Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Fri, 18 Feb 2022 10:51:47 +0300
Subject: [PATCH] Native: fix classpath in KonanCliRunner

It included "konan/lib/*.jar", which became incorrect after adding
kotlin-native-compiler-embeddable.jar to K/N dist in 2baf344f5f5:
after that, the classpath included both kotlin-native.jar and
kotlin-native-compiler-embeddable.jar, so it contained duplicating
classes.

Fix this by choosing particular .jar files from konan/lib, and use
kotlin-native-compiler-embeddable.jar.
---
 .../kotlin/gradle/plugin/konan/KonanToolRunner.kt          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
index 76bb7ea44e3..d6c7d98972f 100644
--- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
+++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
@@ -66,7 +66,12 @@ internal abstract class KonanCliRunner(
 
     final override val execSystemProperties by lazy { mapOf("konan.home" to konanHome) }
 
-    final override val classpath by lazy { project.fileTree("$konanHome/konan/lib/").apply { include("*.jar") }.files }
+    final override val classpath by lazy {
+        project.fileTree("$konanHome/konan/lib/").apply {
+            include("trove4j.jar")
+            include("kotlin-native-compiler-embeddable.jar")
+        }.files
+    }
 
     final override fun checkClasspath() =
             check(classpath.isNotEmpty()) {