From 5a22917f82e9c5bef78b9eeb9176592e138cd619 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 31 May 2017 08:37:07 +0300 Subject: [PATCH] Run Gradle Android tests with other Gradle tests --- .../kotlin-gradle-plugin-integration-tests/build.gradle | 4 ---- .../kotlin/gradle/AbstractKotlinAndroidGradleTests.kt | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle index ccabb0c90e3..100fca4151c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle @@ -28,10 +28,6 @@ processResources { tasks.withType(Test) { onlyIf { !project.hasProperty("noTest") } - if (!project.hasProperty("android")) { - exclude '**/KotlinAndroid*' - } - executable = "${JDK_18}/bin/java" testLogging { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index c21e87b9968..2d769af2580 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -7,10 +7,9 @@ import org.junit.Test import java.io.File -class KotlinAndroidGradleCLIOnly : AbstractKotlinAndroidGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.0") -class KotlinAndroid30GradleCLIOnly : AbstractKotlinAndroidGradleTests(gradleVersion = "4.0-rc-1", androidGradlePluginVersion = "3.0.0-alpha2") - -class KotlinAndroidWithJackGradleCLIOnly : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+") +class KotlinAndroidGradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.0") +class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "4.0-rc-1", androidGradlePluginVersion = "3.0.0-alpha2") +class KotlinAndroidWithJackGradleIT : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+") const val ANDROID_HOME_PATH = "../../../dependencies/androidSDK"