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 9f53e1ffad4..4307cc7f0af 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -258,9 +258,21 @@ val mppTestsTask = tasks.register("kgpMppTests") { if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask) } +val androidTestsTask = tasks.register("kgpAndroidTests") { + group = KGP_TEST_TASKS_GROUP + description = "Run Android Kotlin Gradle plugin tests" + maxParallelForks = maxParallelTestForks + useJUnitPlatform { + includeTags("AndroidKGP") + includeEngines("junit-jupiter") + } + + if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask) +} + tasks.named("check") { dependsOn("testAdvanceGradleVersion") - dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask) + dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask, androidTestsTask) if (isTeamcityBuild) { dependsOn("testAdvanceGradleVersionMppAndAndroid") dependsOn("testMppAndAndroid") @@ -314,7 +326,8 @@ tasks.withType { jsTestsTask.name, daemonsTestsTask.name, otherPluginsTestTask.name, - mppTestsTask.name + mppTestsTask.name, + androidTestsTask.name ) if (shouldApplyJunitPlatform) { maxHeapSize = "512m" 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 bd3420295eb..42c61d8f21e 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 @@ -47,6 +47,19 @@ annotation class JsGradlePluginTests @Tag("MppKGP") annotation class MppGradlePluginTests +/** + * Add it to the tests covering Kotlin Android Gradle plugin. + */ +@Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION) +@Retention(AnnotationRetention.RUNTIME) +@Tag("AndroidKGP") +annotation class AndroidGradlePluginTests + +/** + * Add it the tests that are not covered by tags above. + * + * Usually it would be tests for kapt, serialization plugins, etc... + */ @Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) @Tag("OtherKGP")