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

[gradle-plugin] Use main targets in the test component by default

Browse Source
This commit is contained in:
Ilya Matveev
2018-08-30 16:01:27 +07:00
committed by Ilya Matveev
parent 94e6c2a514
commit a91f91bc65
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/KotlinNativeTestSuite.kt
+1
View File
@@ -41,6 +41,7 @@ open class KotlinNativeTestSuite @Inject constructor(
init { init {
getImplementationDependencies().extendsFrom(testedComponent.getImplementationDependencies()) getImplementationDependencies().extendsFrom(testedComponent.getImplementationDependencies())
konanTargets.set(project.provider { testedComponent.konanTargets.get() })
} }
override fun getDisplayName(): DisplayName = Describables.withTypeAndName("Kotlin/Native test suite", name) override fun getDisplayName(): DisplayName = Describables.withTypeAndName("Kotlin/Native test suite", name)
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt
+5 -3
View File
@@ -175,9 +175,11 @@ class KotlinNativePlugin @Inject constructor(val attributesFactory: ImmutableAtt
objects objects
) )
val binary = component.addTestExecutable(variantIdentity) if (hostManager.isEnabled(target)) {
if (target == HostManager.host) { val binary = component.addTestExecutable(variantIdentity)
component.testBinary.set(binary) if (target == HostManager.host) {
component.testBinary.set(binary)
}
} }
} }
component.binaries.realizeNow() component.binaries.realizeNow()