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

Run Gradle Android tests with other Gradle tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-05-31 08:37:07 +03:00
parent aa9a40b61b
commit 5a22917f82
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
-4
View File
@@ -28,10 +28,6 @@ processResources {
tasks.withType(Test) { tasks.withType(Test) {
onlyIf { !project.hasProperty("noTest") } onlyIf { !project.hasProperty("noTest") }
if (!project.hasProperty("android")) {
exclude '**/KotlinAndroid*'
}
executable = "${JDK_18}/bin/java" executable = "${JDK_18}/bin/java"
testLogging { testLogging {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
+3 -4
View File
@@ -7,10 +7,9 @@ import org.junit.Test
import java.io.File import java.io.File
class KotlinAndroidGradleCLIOnly : AbstractKotlinAndroidGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.0") class KotlinAndroidGradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.0")
class KotlinAndroid30GradleCLIOnly : AbstractKotlinAndroidGradleTests(gradleVersion = "4.0-rc-1", androidGradlePluginVersion = "3.0.0-alpha2") class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "4.0-rc-1", androidGradlePluginVersion = "3.0.0-alpha2")
class KotlinAndroidWithJackGradleIT : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+")
class KotlinAndroidWithJackGradleCLIOnly : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+")
const val ANDROID_HOME_PATH = "../../../dependencies/androidSDK" const val ANDROID_HOME_PATH = "../../../dependencies/androidSDK"