diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index 97b52b2a0d3..bf52f09fb8f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -204,19 +204,6 @@ val allParallelTestsTask = tasks.register("kgpAllParallelTests") { if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask) } -val simpleTestsTask = tasks.register("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("kgpJvmTests") { group = KGP_TEST_TASKS_GROUP description = "Run tests for Kotlin/JVM part of Gradle plugin" @@ -247,8 +234,6 @@ val daemonsTestsTask = tasks.register("kgpDaemonTests") { description = "Run only Gradle and Kotlin daemon tests for Kotlin Gradle Plugin" maxParallelForks = 1 - mustRunAfter(simpleTestsTask) - useJUnitPlatform { includeTags("DaemonsKGP") includeEngines("junit-jupiter") @@ -296,7 +281,7 @@ val androidTestsTask = tasks.register("kgpAndroidTests") { tasks.named("check") { dependsOn("testAdvanceGradleVersion") - dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask, androidTestsTask) + dependsOn(jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask, androidTestsTask) if (isTeamcityBuild) { dependsOn("testAdvanceGradleVersionMppAndAndroid") dependsOn("testMppAndAndroid") @@ -346,7 +331,6 @@ tasks.withType { val shouldApplyJunitPlatform = name !in setOf( allParallelTestsTask.name, - simpleTestsTask.name, jvmTestsTask.name, jsTestsTask.name, daemonsTestsTask.name, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt index 6962cb4be04..0a1bd85e391 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt @@ -7,15 +7,6 @@ package org.jetbrains.kotlin.gradle.testbase 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. */