From 5c6cb60ad3ec77b041c03da96ee45004650c2a86 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 13 Apr 2020 17:52:54 +0700 Subject: [PATCH] [tests] Fix task dependency for testObjCExport --- backend.native/tests/build.gradle | 8 ++++++++ .../kotlin/gradle/plugin/konan/KonanToolRunner.kt | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 042ef09296f..a1cfe489170 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -3961,6 +3961,10 @@ if (isAppleTarget(project)) { srcDir "objcexport/library" artifactName "test-library" + if (!useCustomDist) { + dependsOn ":${target.name}CrossDistRuntime", ':distCompiler' + } + extraOpts "-Xshort-module-name=MyLibrary" extraOpts "-module-name", "org.jetbrains.kotlin.native.test-library" } @@ -4006,6 +4010,10 @@ if (isAppleTarget(project)) { srcDir "objcexport/library" artifactName "test-library" + if (!useCustomDist) { + dependsOn ":${target.name}CrossDistRuntime", ':distCompiler' + } + extraOpts "-Xshort-module-name=MyLibrary" extraOpts "-module-name", "org.jetbrains.kotlin.native.test-library" } diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt index 908fdb76fb7..fbdfa56047a 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.gradle.plugin.konan import org.gradle.api.Named import org.gradle.api.Project import org.gradle.api.file.FileCollection +import org.jetbrains.kotlin.gradle.plugin.konan.KonanPlugin.ProjectProperty.KONAN_HOME import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.KonanTarget @@ -91,7 +92,7 @@ internal abstract class KonanCliRunner( project.logger.info("Run tool: $toolName with args: ${args.joinToString(separator = " ")}") if (classpath.isEmpty) { throw IllegalStateException("Classpath of the tool is empty: $toolName\n" + - "Probably the '${KonanPlugin.ProjectProperty.KONAN_HOME}' project property contains an incorrect path.\n" + + "Probably the '${KONAN_HOME.propertyName}' project property contains an incorrect path.\n" + "Please change it to the compiler root directory and rerun the build.") }