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

Gradle, native: Add separate classes for targets with different tests

Browse Source
This commit is contained in:
Ilya Matveev
2019-12-05 17:15:30 +07:00
parent e6ab70c18d
commit cc3438f20c
5 changed files with 64 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt
+6 -13
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.generators.gradle.dsl
import org.jetbrains.kotlin.generators.gradle.dsl.NativeFQNames.Presets import org.jetbrains.kotlin.generators.gradle.dsl.NativeFQNames.Presets
import org.jetbrains.kotlin.generators.gradle.dsl.NativeFQNames.Targets import org.jetbrains.kotlin.generators.gradle.dsl.NativeFQNames.Targets
import org.jetbrains.kotlin.generators.gradle.dsl.NativeFQNames.TestRuns
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.presetName import org.jetbrains.kotlin.konan.target.presetName
@@ -23,11 +22,10 @@ internal fun KotlinPresetEntry.typeNames(): Set<TypeName> = setOf(presetType, ta
internal const val MPP_PACKAGE = "org.jetbrains.kotlin.gradle.plugin.mpp" internal const val MPP_PACKAGE = "org.jetbrains.kotlin.gradle.plugin.mpp"
internal object NativeFQNames { internal object NativeFQNames {
const val nativePackage = "org.jetbrains.kotlin.gradle.targets.native"
object Targets { object Targets {
const val base = "$MPP_PACKAGE.KotlinNativeTarget" const val base = "$MPP_PACKAGE.KotlinNativeTarget"
const val withTests = "$MPP_PACKAGE.KotlinNativeTargetWithTests" const val withHostTests = "$MPP_PACKAGE.KotlinNativeTargetWithHostTests"
const val withSimulatorTests = "$MPP_PACKAGE.KotlinNativeTargetWithSimulatorTests"
} }
object Presets { object Presets {
@@ -35,11 +33,6 @@ internal object NativeFQNames {
const val withHostTests = "$MPP_PACKAGE.KotlinNativeTargetWithHostTestsPreset" const val withHostTests = "$MPP_PACKAGE.KotlinNativeTargetWithHostTestsPreset"
const val withSimulatorTests = "$MPP_PACKAGE.KotlinNativeTargetWithSimulatorTestsPreset" const val withSimulatorTests = "$MPP_PACKAGE.KotlinNativeTargetWithSimulatorTestsPreset"
} }
object TestRuns {
const val host = "$nativePackage.KotlinNativeHostTestRun"
const val simulator = "$nativePackage.KotlinNativeSimulatorTestRun"
}
} }
internal val jvmPresetEntry = KotlinPresetEntry( internal val jvmPresetEntry = KotlinPresetEntry(
@@ -71,14 +64,14 @@ internal val nativePresetEntries = HostManager().targets
val (presetType, targetType) = when (target) { val (presetType, targetType) = when (target) {
in nativeTargetsWithHostTests -> in nativeTargetsWithHostTests ->
typeName(Presets.withHostTests) to typeName(Targets.withTests, TestRuns.host) Presets.withHostTests to Targets.withHostTests
in nativeTargetsWithSimulatorTests -> in nativeTargetsWithSimulatorTests ->
typeName(Presets.withSimulatorTests) to typeName(Targets.withTests, TestRuns.simulator) Presets.withSimulatorTests to Targets.withSimulatorTests
else -> else ->
typeName(Presets.simple) to typeName(Targets.base) Presets.simple to Targets.base
} }
KotlinPresetEntry(target.presetName, presetType, targetType) KotlinPresetEntry(target.presetName, typeName(presetType), typeName(targetType))
} }
internal val allPresetEntries = listOf( internal val allPresetEntries = listOf(
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions.kt
+14 -15
View File
@@ -9,13 +9,12 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsTargetPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmTargetPreset import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmTargetPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetPreset import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTests
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTestsPreset import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTestsPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTestsPreset import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTestsPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
import org.jetbrains.kotlin.gradle.targets.native.KotlinNativeHostTestRun
import org.jetbrains.kotlin.gradle.targets.native.KotlinNativeSimulatorTestRun
// DO NOT EDIT MANUALLY! Generated by org.jetbrains.kotlin.generators.gradle.dsl.MppPresetFunctionsCodegenKt // DO NOT EDIT MANUALLY! Generated by org.jetbrains.kotlin.generators.gradle.dsl.MppPresetFunctionsCodegenKt
@@ -158,8 +157,8 @@ interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithP
fun iosX64( fun iosX64(
name: String = "iosX64", name: String = "iosX64",
configure: KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>.() -> Unit = { } configure: KotlinNativeTargetWithSimulatorTests.() -> Unit = { }
): KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun> = ): KotlinNativeTargetWithSimulatorTests =
configureOrCreate( configureOrCreate(
name, name,
presets.getByName("iosX64") as KotlinNativeTargetWithSimulatorTestsPreset, presets.getByName("iosX64") as KotlinNativeTargetWithSimulatorTestsPreset,
@@ -203,8 +202,8 @@ interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithP
fun watchosX86( fun watchosX86(
name: String = "watchosX86", name: String = "watchosX86",
configure: KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>.() -> Unit = { } configure: KotlinNativeTargetWithSimulatorTests.() -> Unit = { }
): KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun> = ): KotlinNativeTargetWithSimulatorTests =
configureOrCreate( configureOrCreate(
name, name,
presets.getByName("watchosX86") as KotlinNativeTargetWithSimulatorTestsPreset, presets.getByName("watchosX86") as KotlinNativeTargetWithSimulatorTestsPreset,
@@ -233,8 +232,8 @@ interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithP
fun tvosX64( fun tvosX64(
name: String = "tvosX64", name: String = "tvosX64",
configure: KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>.() -> Unit = { } configure: KotlinNativeTargetWithSimulatorTests.() -> Unit = { }
): KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun> = ): KotlinNativeTargetWithSimulatorTests =
configureOrCreate( configureOrCreate(
name, name,
presets.getByName("tvosX64") as KotlinNativeTargetWithSimulatorTestsPreset, presets.getByName("tvosX64") as KotlinNativeTargetWithSimulatorTestsPreset,
@@ -248,8 +247,8 @@ interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithP
fun linuxX64( fun linuxX64(
name: String = "linuxX64", name: String = "linuxX64",
configure: KotlinNativeTargetWithTests<KotlinNativeHostTestRun>.() -> Unit = { } configure: KotlinNativeTargetWithHostTests.() -> Unit = { }
): KotlinNativeTargetWithTests<KotlinNativeHostTestRun> = ): KotlinNativeTargetWithHostTests =
configureOrCreate( configureOrCreate(
name, name,
presets.getByName("linuxX64") as KotlinNativeTargetWithHostTestsPreset, presets.getByName("linuxX64") as KotlinNativeTargetWithHostTestsPreset,
@@ -323,8 +322,8 @@ interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithP
fun mingwX64( fun mingwX64(
name: String = "mingwX64", name: String = "mingwX64",
configure: KotlinNativeTargetWithTests<KotlinNativeHostTestRun>.() -> Unit = { } configure: KotlinNativeTargetWithHostTests.() -> Unit = { }
): KotlinNativeTargetWithTests<KotlinNativeHostTestRun> = ): KotlinNativeTargetWithHostTests =
configureOrCreate( configureOrCreate(
name, name,
presets.getByName("mingwX64") as KotlinNativeTargetWithHostTestsPreset, presets.getByName("mingwX64") as KotlinNativeTargetWithHostTestsPreset,
@@ -353,8 +352,8 @@ interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithP
fun macosX64( fun macosX64(
name: String = "macosX64", name: String = "macosX64",
configure: KotlinNativeTargetWithTests<KotlinNativeHostTestRun>.() -> Unit = { } configure: KotlinNativeTargetWithHostTests.() -> Unit = { }
): KotlinNativeTargetWithTests<KotlinNativeHostTestRun> = ): KotlinNativeTargetWithHostTests =
configureOrCreate( configureOrCreate(
name, name,
presets.getByName("macosX64") as KotlinNativeTargetWithHostTestsPreset, presets.getByName("macosX64") as KotlinNativeTargetWithHostTestsPreset,
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
+9 -3
View File
@@ -16,8 +16,9 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinNativeBinaryContainer
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
import org.jetbrains.kotlin.gradle.targets.native.KotlinNativeBinaryTestRun import org.jetbrains.kotlin.gradle.targets.native.KotlinNativeBinaryTestRun
import org.jetbrains.kotlin.gradle.targets.native.KotlinNativeHostTestRun
import org.jetbrains.kotlin.gradle.targets.native.KotlinNativeSimulatorTestRun
import org.jetbrains.kotlin.gradle.targets.native.NativeBinaryTestRunSource import org.jetbrains.kotlin.gradle.targets.native.NativeBinaryTestRunSource
import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import javax.inject.Inject import javax.inject.Inject
@@ -65,8 +66,7 @@ open class KotlinNativeTarget @Inject constructor(
} }
} }
// TODO: Add separate classes for corresponding targets? abstract class KotlinNativeTargetWithTests<T : KotlinNativeBinaryTestRun>(
open class KotlinNativeTargetWithTests<T : KotlinNativeBinaryTestRun> @Inject constructor(
project: Project, project: Project,
konanTarget: KonanTarget konanTarget: KonanTarget
) : KotlinNativeTarget(project, konanTarget), KotlinTargetWithTests<NativeBinaryTestRunSource, T> { ) : KotlinNativeTarget(project, konanTarget), KotlinTargetWithTests<NativeBinaryTestRunSource, T> {
@@ -74,3 +74,9 @@ open class KotlinNativeTargetWithTests<T : KotlinNativeBinaryTestRun> @Inject co
override lateinit var testRuns: NamedDomainObjectContainer<T> override lateinit var testRuns: NamedDomainObjectContainer<T>
internal set internal set
} }
open class KotlinNativeTargetWithHostTests @Inject constructor(project: Project, konanTarget: KonanTarget) :
KotlinNativeTargetWithTests<KotlinNativeHostTestRun>(project, konanTarget)
open class KotlinNativeTargetWithSimulatorTests @Inject constructor(project: Project, konanTarget: KonanTarget) :
KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>(project, konanTarget)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
+26 -13
View File
@@ -394,16 +394,19 @@ open class KotlinNativeTargetConfigurator<T : KotlinNativeTarget>(
} }
} }
abstract class KotlinNativeTargetWithTestsConfigurator<TaskType : KotlinNativeTest, TestRunType : KotlinNativeBinaryTestRun>( abstract class KotlinNativeTargetWithTestsConfigurator<
TargetType : KotlinNativeTargetWithTests<TestRunType>,
TestRunType : KotlinNativeBinaryTestRun,
TaskType : KotlinNativeTest>(
kotlinPluginVersion: String kotlinPluginVersion: String
) : KotlinNativeTargetConfigurator<KotlinNativeTargetWithTests<TestRunType>>(kotlinPluginVersion), ) : KotlinNativeTargetConfigurator<TargetType>(kotlinPluginVersion),
KotlinTargetWithTestsConfigurator<TestRunType, KotlinNativeTargetWithTests<TestRunType>> { KotlinTargetWithTestsConfigurator<TestRunType, TargetType> {
abstract val testTaskClass: Class<TaskType> abstract val testTaskClass: Class<TaskType>
abstract fun isTestTaskEnabled(target: KotlinNativeTargetWithTests<*>): Boolean abstract fun isTestTaskEnabled(target: TargetType): Boolean
protected open fun configureTestTask(target: KotlinNativeTargetWithTests<*>, testTask: TaskType) { protected open fun configureTestTask(target: TargetType, testTask: TaskType) {
testTask.group = LifecycleBasePlugin.VERIFICATION_GROUP testTask.group = LifecycleBasePlugin.VERIFICATION_GROUP
testTask.description = "Executes Kotlin/Native unit tests for target ${target.name}." testTask.description = "Executes Kotlin/Native unit tests for target ${target.name}."
testTask.targetName = target.name testTask.targetName = target.name
@@ -415,7 +418,7 @@ abstract class KotlinNativeTargetWithTestsConfigurator<TaskType : KotlinNativeTe
testTask.configureConventions() testTask.configureConventions()
} }
protected open fun configureTestRun(target: KotlinNativeTargetWithTests<*>, testRun: AbstractKotlinNativeTestRun<TaskType>) { protected open fun configureTestRun(target: TargetType, testRun: AbstractKotlinNativeTestRun<TaskType>) {
with(testRun) { with(testRun) {
val project = target.project val project = target.project
@@ -433,7 +436,12 @@ abstract class KotlinNativeTargetWithTestsConfigurator<TaskType : KotlinNativeTe
} }
class KotlinNativeTargetWithHostTestsConfigurator(kotlinPluginVersion: String) : class KotlinNativeTargetWithHostTestsConfigurator(kotlinPluginVersion: String) :
KotlinNativeTargetWithTestsConfigurator<KotlinNativeHostTest, KotlinNativeHostTestRun>(kotlinPluginVersion) { KotlinNativeTargetWithTestsConfigurator<
KotlinNativeTargetWithHostTests,
KotlinNativeHostTestRun,
KotlinNativeHostTest>(
kotlinPluginVersion
) {
override val testTaskClass: Class<KotlinNativeHostTest> override val testTaskClass: Class<KotlinNativeHostTest>
get() = KotlinNativeHostTest::class.java get() = KotlinNativeHostTest::class.java
@@ -441,18 +449,23 @@ class KotlinNativeTargetWithHostTestsConfigurator(kotlinPluginVersion: String) :
override val testRunClass: Class<KotlinNativeHostTestRun> override val testRunClass: Class<KotlinNativeHostTestRun>
get() = KotlinNativeHostTestRun::class.java get() = KotlinNativeHostTestRun::class.java
override fun isTestTaskEnabled(target: KotlinNativeTargetWithTests<*>): Boolean = override fun isTestTaskEnabled(target: KotlinNativeTargetWithHostTests): Boolean =
target.konanTarget.isCurrentHost target.konanTarget.isCurrentHost
override fun createTestRun( override fun createTestRun(
name: String, name: String,
target: KotlinNativeTargetWithTests<KotlinNativeHostTestRun> target: KotlinNativeTargetWithHostTests
): KotlinNativeHostTestRun = ): KotlinNativeHostTestRun =
DefaultHostTestRun(name, target).apply { configureTestRun(target, this) } DefaultHostTestRun(name, target).apply { configureTestRun(target, this) }
} }
class KotlinNativeTargetWithSimulatorTestsConfigurator(kotlinPluginVersion: String) : class KotlinNativeTargetWithSimulatorTestsConfigurator(kotlinPluginVersion: String) :
KotlinNativeTargetWithTestsConfigurator<KotlinNativeSimulatorTest, KotlinNativeSimulatorTestRun>(kotlinPluginVersion) { KotlinNativeTargetWithTestsConfigurator<
KotlinNativeTargetWithSimulatorTests,
KotlinNativeSimulatorTestRun,
KotlinNativeSimulatorTest>(
kotlinPluginVersion
) {
override val testTaskClass: Class<KotlinNativeSimulatorTest> override val testTaskClass: Class<KotlinNativeSimulatorTest>
get() = KotlinNativeSimulatorTest::class.java get() = KotlinNativeSimulatorTest::class.java
@@ -460,10 +473,10 @@ class KotlinNativeTargetWithSimulatorTestsConfigurator(kotlinPluginVersion: Stri
override val testRunClass: Class<KotlinNativeSimulatorTestRun> override val testRunClass: Class<KotlinNativeSimulatorTestRun>
get() = KotlinNativeSimulatorTestRun::class.java get() = KotlinNativeSimulatorTestRun::class.java
override fun isTestTaskEnabled(target: KotlinNativeTargetWithTests<*>): Boolean = override fun isTestTaskEnabled(target: KotlinNativeTargetWithSimulatorTests): Boolean =
HostManager.hostIsMac HostManager.hostIsMac
override fun configureTestTask(target: KotlinNativeTargetWithTests<*>, testTask: KotlinNativeSimulatorTest) { override fun configureTestTask(target: KotlinNativeTargetWithSimulatorTests, testTask: KotlinNativeSimulatorTest) {
super.configureTestTask(target, testTask) super.configureTestTask(target, testTask)
testTask.deviceId = when (target.konanTarget) { testTask.deviceId = when (target.konanTarget) {
@@ -476,7 +489,7 @@ class KotlinNativeTargetWithSimulatorTestsConfigurator(kotlinPluginVersion: Stri
override fun createTestRun( override fun createTestRun(
name: String, name: String,
target: KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun> target: KotlinNativeTargetWithSimulatorTests
): KotlinNativeSimulatorTestRun = ): KotlinNativeSimulatorTestRun =
DefaultSimulatorTestRun(name, target).apply { configureTestRun(target, this) } DefaultSimulatorTestRun(name, target).apply { configureTestRun(target, this) }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
+8 -12
View File
@@ -184,27 +184,23 @@ open class KotlinNativeTargetPreset(name: String, project: Project, konanTarget:
} }
open class KotlinNativeTargetWithHostTestsPreset(name: String, project: Project, konanTarget: KonanTarget, kotlinPluginVersion: String) : open class KotlinNativeTargetWithHostTestsPreset(name: String, project: Project, konanTarget: KonanTarget, kotlinPluginVersion: String) :
AbstractKotlinNativeTargetPreset<KotlinNativeTargetWithTests<KotlinNativeHostTestRun>>(name, project, konanTarget, kotlinPluginVersion) { AbstractKotlinNativeTargetPreset<KotlinNativeTargetWithHostTests>(name, project, konanTarget, kotlinPluginVersion) {
override fun createTargetConfigurator(): KotlinTargetConfigurator<KotlinNativeTargetWithTests<KotlinNativeHostTestRun>> = override fun createTargetConfigurator(): KotlinNativeTargetWithHostTestsConfigurator =
KotlinNativeTargetWithHostTestsConfigurator(kotlinPluginVersion) KotlinNativeTargetWithHostTestsConfigurator(kotlinPluginVersion)
@Suppress("UNCHECKED_CAST") override fun instantiateTarget(name: String): KotlinNativeTargetWithHostTests =
override fun instantiateTarget(name: String): KotlinNativeTargetWithTests<KotlinNativeHostTestRun> = project.objects.newInstance(KotlinNativeTargetWithHostTests::class.java, project, konanTarget)
project.objects.newInstance(KotlinNativeTargetWithTests::class.java, project, konanTarget)
as KotlinNativeTargetWithTests<KotlinNativeHostTestRun>
} }
open class KotlinNativeTargetWithSimulatorTestsPreset(name: String, project: Project, konanTarget: KonanTarget, kotlinPluginVersion: String) : open class KotlinNativeTargetWithSimulatorTestsPreset(name: String, project: Project, konanTarget: KonanTarget, kotlinPluginVersion: String) :
AbstractKotlinNativeTargetPreset<KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>>(name, project, konanTarget, kotlinPluginVersion) { AbstractKotlinNativeTargetPreset<KotlinNativeTargetWithSimulatorTests>(name, project, konanTarget, kotlinPluginVersion) {
override fun createTargetConfigurator(): KotlinTargetConfigurator<KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>> = override fun createTargetConfigurator(): KotlinNativeTargetWithSimulatorTestsConfigurator =
KotlinNativeTargetWithSimulatorTestsConfigurator(kotlinPluginVersion) KotlinNativeTargetWithSimulatorTestsConfigurator(kotlinPluginVersion)
@Suppress("UNCHECKED_CAST") override fun instantiateTarget(name: String): KotlinNativeTargetWithSimulatorTests =
override fun instantiateTarget(name: String): KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun> = project.objects.newInstance(KotlinNativeTargetWithSimulatorTests::class.java, project, konanTarget)
project.objects.newInstance(KotlinNativeTargetWithTests::class.java, project, konanTarget)
as KotlinNativeTargetWithTests<KotlinNativeSimulatorTestRun>
} }
internal val KonanTarget.isCurrentHost: Boolean internal val KonanTarget.isCurrentHost: Boolean