Remove @SimpleGradlePluginTests annotation
And related Gradle tasks to run it. ^KT-45745 Fixed
This commit is contained in:
committed by
teamcity
parent
881a6bed35
commit
10fdc399c4
@@ -204,19 +204,6 @@ val allParallelTestsTask = tasks.register<Test>("kgpAllParallelTests") {
|
|||||||
if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
|
if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
|
||||||
}
|
}
|
||||||
|
|
||||||
val simpleTestsTask = tasks.register<Test>("kgpSimpleTests") {
|
|
||||||
group = KGP_TEST_TASKS_GROUP
|
|
||||||
description = "Run only simple tests for Kotlin Gradle Plugin (deprecated)"
|
|
||||||
maxParallelForks = maxParallelTestForks
|
|
||||||
|
|
||||||
useJUnitPlatform {
|
|
||||||
includeTags("SimpleKGP")
|
|
||||||
includeEngines("junit-jupiter")
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
|
|
||||||
}
|
|
||||||
|
|
||||||
val jvmTestsTask = tasks.register<Test>("kgpJvmTests") {
|
val jvmTestsTask = tasks.register<Test>("kgpJvmTests") {
|
||||||
group = KGP_TEST_TASKS_GROUP
|
group = KGP_TEST_TASKS_GROUP
|
||||||
description = "Run tests for Kotlin/JVM part of Gradle plugin"
|
description = "Run tests for Kotlin/JVM part of Gradle plugin"
|
||||||
@@ -247,8 +234,6 @@ val daemonsTestsTask = tasks.register<Test>("kgpDaemonTests") {
|
|||||||
description = "Run only Gradle and Kotlin daemon tests for Kotlin Gradle Plugin"
|
description = "Run only Gradle and Kotlin daemon tests for Kotlin Gradle Plugin"
|
||||||
maxParallelForks = 1
|
maxParallelForks = 1
|
||||||
|
|
||||||
mustRunAfter(simpleTestsTask)
|
|
||||||
|
|
||||||
useJUnitPlatform {
|
useJUnitPlatform {
|
||||||
includeTags("DaemonsKGP")
|
includeTags("DaemonsKGP")
|
||||||
includeEngines("junit-jupiter")
|
includeEngines("junit-jupiter")
|
||||||
@@ -296,7 +281,7 @@ val androidTestsTask = tasks.register<Test>("kgpAndroidTests") {
|
|||||||
|
|
||||||
tasks.named<Task>("check") {
|
tasks.named<Task>("check") {
|
||||||
dependsOn("testAdvanceGradleVersion")
|
dependsOn("testAdvanceGradleVersion")
|
||||||
dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask, androidTestsTask)
|
dependsOn(jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask, androidTestsTask)
|
||||||
if (isTeamcityBuild) {
|
if (isTeamcityBuild) {
|
||||||
dependsOn("testAdvanceGradleVersionMppAndAndroid")
|
dependsOn("testAdvanceGradleVersionMppAndAndroid")
|
||||||
dependsOn("testMppAndAndroid")
|
dependsOn("testMppAndAndroid")
|
||||||
@@ -346,7 +331,6 @@ tasks.withType<Test> {
|
|||||||
|
|
||||||
val shouldApplyJunitPlatform = name !in setOf(
|
val shouldApplyJunitPlatform = name !in setOf(
|
||||||
allParallelTestsTask.name,
|
allParallelTestsTask.name,
|
||||||
simpleTestsTask.name,
|
|
||||||
jvmTestsTask.name,
|
jvmTestsTask.name,
|
||||||
jsTestsTask.name,
|
jsTestsTask.name,
|
||||||
daemonsTestsTask.name,
|
daemonsTestsTask.name,
|
||||||
|
|||||||
-9
@@ -7,15 +7,6 @@ package org.jetbrains.kotlin.gradle.testbase
|
|||||||
|
|
||||||
import org.junit.jupiter.api.Tag
|
import org.junit.jupiter.api.Tag
|
||||||
|
|
||||||
/**
|
|
||||||
* Add it to test classes performing simple KGP checks (deprecated).
|
|
||||||
*/
|
|
||||||
@Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION)
|
|
||||||
@Retention(AnnotationRetention.RUNTIME)
|
|
||||||
@Tag("SimpleKGP")
|
|
||||||
@Deprecated("will be removed soon", level = DeprecationLevel.ERROR)
|
|
||||||
annotation class SimpleGradlePluginTests
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add it to test classes performing Gradle or Kotlin daemon checks.
|
* Add it to test classes performing Gradle or Kotlin daemon checks.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user