From 23ea1a1a607c6f37ddcbaea021362df76af0f619 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Mon, 31 Jul 2017 16:51:21 +0300 Subject: [PATCH] Push Android Gradle plugin version used in tests to 3.0.0-alpha8 --- .../kotlin/gradle/AbstractKotlinAndroidGradleTests.kt | 2 +- .../test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 a545f70e27b..e468af1767b 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 @@ -10,7 +10,7 @@ import java.io.File class KotlinAndroidGradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.0") class KotlinAndroidWithJackGradleIT : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+") -class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "4.0-rc-1", androidGradlePluginVersion = "3.0.0-alpha4") { +class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "4.1-rc-1", androidGradlePluginVersion = "3.0.0-alpha8") { @Test fun testApplyWithFeaturePlugin() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt index 2fd266b2311..a0433ca77f1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt @@ -6,12 +6,12 @@ import java.io.File class Kapt3Android30IT : Kapt3AndroidIT() { override val androidGradlePluginVersion: String - get() = "3.0.0-alpha4" + get() = "3.0.0-alpha8" } open class Kapt3AndroidIT : Kapt3BaseIT() { companion object { - private const val GRADLE_VERSION = "4.0-rc-1" + private const val GRADLE_VERSION = "4.1-rc-1" } protected open val androidGradlePluginVersion: String