From efeea9d7d44e58a1df54d053bc748fdb1e86bf4a Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Wed, 27 Jun 2018 04:26:14 +0300
Subject: [PATCH] Update android tools versions in Gradle plugin tests

---
 .../AbstractKotlinAndroidGradleTests.kt       |  2 +-
 .../jetbrains/kotlin/gradle/Kapt3AndroidIT.kt | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 14 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 8453de33a66..90681b9713f 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
@@ -14,7 +14,7 @@ class KotlinAndroidGradleIT :
     AbstractKotlinAndroidGradleTests(gradleVersion = GradleVersionRequired.AtLeast("3.4"), androidGradlePluginVersion = "2.3.0")
 
 // TODO If we there is a way to fetch the latest Android plugin version, test against the latest version
-class KotlinAndroid32GradleIT : KotlinAndroid3GradleIT(GradleVersionRequired.AtLeast("4.6"), "3.2.0-alpha15") {
+class KotlinAndroid32GradleIT : KotlinAndroid3GradleIT(GradleVersionRequired.AtLeast("4.6"), "3.2.0-beta01") {
 
     @Test
     fun testKaptUsingApOptionProvidersAsNestedInputOutput() = with(Project("AndroidProject", gradleVersion)) {
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 2b1b9e242ec..316c618deb1 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
@@ -4,20 +4,23 @@ import org.jetbrains.kotlin.gradle.util.isLegacyAndroidGradleVersion
 import org.jetbrains.kotlin.gradle.util.modify
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Test
+import java.io.File
 
-class Kapt3Android30IT : Kapt3AndroidIT() {
+class Kapt3Android32IT : Kapt3AndroidIT() {
     override val androidGradlePluginVersion: String
-        get() = "3.2.0-alpha18"
+        get() = "3.2.0-beta01"
+
+    override val gradleVersion: GradleVersionRequired
+        get() = GradleVersionRequired.AtLeast("4.6")
 }
 
 open class Kapt3AndroidIT : Kapt3BaseIT() {
-    companion object {
-        private val GRADLE_VERSION = GradleVersionRequired.AtLeast("4.6")
-    }
-
     protected open val androidGradlePluginVersion: String
         get() = "2.3.0"
 
+    protected open val gradleVersion: GradleVersionRequired
+        get() = GradleVersionRequired.AtLeast("4.1")
+
     private fun androidBuildOptions() =
         BuildOptions(
             withDaemon = true,
@@ -30,7 +33,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
 
     @Test
     fun testButterKnife() {
-        val project = Project("android-butterknife", GRADLE_VERSION, directoryPrefix = "kapt2")
+        val project = Project("android-butterknife", gradleVersion, directoryPrefix = "kapt2")
         val options = androidBuildOptions()
 
         project.build("assembleDebug", options = options) {
@@ -62,7 +65,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
 
     @Test
     fun testDagger() {
-        val project = Project("android-dagger", GRADLE_VERSION, directoryPrefix = "kapt2")
+        val project = Project("android-dagger", gradleVersion, directoryPrefix = "kapt2")
         val options = androidBuildOptions()
 
         project.build("assembleDebug", options = options) {
@@ -89,7 +92,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
 
     @Test
     fun testKt15001() {
-        val project = Project("kt15001", GRADLE_VERSION, directoryPrefix = "kapt2")
+        val project = Project("kt15001", gradleVersion, directoryPrefix = "kapt2")
         val options = androidBuildOptions()
 
         project.build("assembleDebug", options = options) {
@@ -100,7 +103,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
 
     @Test
     fun testDbFlow() {
-        val project = Project("android-dbflow", GRADLE_VERSION, directoryPrefix = "kapt2")
+        val project = Project("android-dbflow", gradleVersion, directoryPrefix = "kapt2")
         val options = androidBuildOptions()
 
         project.build("assembleDebug", options = options) {
@@ -115,7 +118,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
 
     @Test
     fun testRealm() {
-        val project = Project("android-realm", GRADLE_VERSION, directoryPrefix = "kapt2")
+        val project = Project("android-realm", gradleVersion, directoryPrefix = "kapt2")
         val options = androidBuildOptions()
 
         project.build("assembleDebug", options = options) {
@@ -130,10 +133,9 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
 
     @Test
     open fun testDatabinding() {
-        val project = Project("android-databinding", GRADLE_VERSION, directoryPrefix = "kapt2")
+        val project = Project("android-databinding", gradleVersion, directoryPrefix = "kapt2")
         val options = androidBuildOptions()
 
-
         if (!isLegacyAndroidGradleVersion(androidGradlePluginVersion)) {
             project.setupWorkingDir()