From 9cefa346bd80da1c78278d4a7dd776f6ba482b37 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 3 Nov 2022 10:42:02 +0100 Subject: [PATCH] [K/N][build] Fix trove4j dependency for K/N tests --- buildSrc/src/main/kotlin/nativeTest.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/nativeTest.kt b/buildSrc/src/main/kotlin/nativeTest.kt index d39717a72a4..02db00e3284 100644 --- a/buildSrc/src/main/kotlin/nativeTest.kt +++ b/buildSrc/src/main/kotlin/nativeTest.kt @@ -128,18 +128,22 @@ fun Project.nativeTest( val customNativeHome = readFromGradle(KOTLIN_NATIVE_HOME) val kotlinNativeCompilerEmbeddable = if (customNativeHome == null) - configurations.detachedConfiguration(dependencies.project(":kotlin-native-compiler-embeddable")) - .also { dependsOn(it) } + configurations.detachedConfiguration( + dependencies.project(":kotlin-native-compiler-embeddable"), + dependencies.module(commonDependency("org.jetbrains.intellij.deps:trove4j")) + ).also { dependsOn(it) } else null customDependencies.forEach(::dependsOn) lazyClassPath { - if (customNativeHome == null) + if (customNativeHome == null) { addAll(kotlinNativeCompilerEmbeddable!!.files) - else + } else { this += file(customNativeHome).resolve("konan/lib/kotlin-native-compiler-embeddable.jar") + this += file(customNativeHome).resolve("konan/lib/trove4j.jar") + } customDependencies.flatMapTo(this) { it.files } }