From 3280075459b04297407d91e91932a7b274997a4a Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 19 Sep 2018 12:52:03 +0300 Subject: [PATCH] Fix framework tests --- .../experimental/internal/AbstractKotlinNativeBinary.kt | 2 +- .../gradle/plugin/experimental/tasks/KotlinNativeCompile.kt | 4 ++-- .../src/test/kotlin/ExperimentalPluginTests.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt index f83acabd07b..632729b3bee 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt @@ -102,7 +102,7 @@ abstract class AbstractKotlinNativeBinary( override fun getDependencies(): ComponentDependencies = dependencies fun getImplementationDependencies(): Configuration = dependencies.implementationDependencies - // A configuration containing klibs + // A configuration containing klibs. override val klibs = configurations.create(names.withPrefix("klibs")).apply { isCanBeConsumed = false attributes.attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinNativeUsage.KLIB)) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt index 8c5f9b81a86..8b61c12046d 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt @@ -121,13 +121,13 @@ open class KotlinNativeCompile @Inject constructor(internal val binary: Abstract // Initializing AbstractCompile properties. init { this.setDestinationDir(project.provider { - if (outputFile.isDirectory) outputFile else outputFile.parentFile + if (kind == FRAMEWORK) outputFile else outputFile.parentFile }) sourceCompatibility = "1.6" targetCompatibility = "1.6" } - // Task action + // Task action. @TaskAction override fun compile() { diff --git a/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt b/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt index dc97a22bec1..d0e3a03d20d 100644 --- a/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt +++ b/tools/kotlin-native-gradle-plugin/src/test/kotlin/ExperimentalPluginTests.kt @@ -429,7 +429,7 @@ class ExperimentalPluginTests { assertEquals( expectedOutcome, it.outcome, - "Task '$taskName' has incorrect outcome. Expected: $expectedOutcome, actual: ${it.outcome}" + "Task '$taskName' has an incorrect outcome." ) } }