azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][build] Fix trove4j dependency for K/N tests

Browse Source
This commit is contained in:
Dmitriy Dolovov
2022-11-03 10:42:02 +01:00
committed by Space Team
parent 95506ff56e
commit 9cefa346bd
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/nativeTest.kt
+8 -4
View File
@@ -128,18 +128,22 @@ fun Project.nativeTest(
val customNativeHome = readFromGradle(KOTLIN_NATIVE_HOME) val customNativeHome = readFromGradle(KOTLIN_NATIVE_HOME)
val kotlinNativeCompilerEmbeddable = if (customNativeHome == null) val kotlinNativeCompilerEmbeddable = if (customNativeHome == null)
configurations.detachedConfiguration(dependencies.project(":kotlin-native-compiler-embeddable")) configurations.detachedConfiguration(
.also { dependsOn(it) } dependencies.project(":kotlin-native-compiler-embeddable"),
dependencies.module(commonDependency("org.jetbrains.intellij.deps:trove4j"))
).also { dependsOn(it) }
else else
null null
customDependencies.forEach(::dependsOn) customDependencies.forEach(::dependsOn)
lazyClassPath { lazyClassPath {
if (customNativeHome == null) if (customNativeHome == null) {
addAll(kotlinNativeCompilerEmbeddable!!.files) addAll(kotlinNativeCompilerEmbeddable!!.files)
else } else {
this += file(customNativeHome).resolve("konan/lib/kotlin-native-compiler-embeddable.jar") this += file(customNativeHome).resolve("konan/lib/kotlin-native-compiler-embeddable.jar")
this += file(customNativeHome).resolve("konan/lib/trove4j.jar")
}
customDependencies.flatMapTo(this) { it.files } customDependencies.flatMapTo(this) { it.files }
} }