From cd40968b724062deceda77ab4d3789af10e81ea7 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Fri, 11 Aug 2017 20:22:41 +0300 Subject: [PATCH] Fix tests failing due to dev builds bundled into Gradle. Push AGP to beta. --- .../kotlin/gradle/AbstractKotlinAndroidGradleTests.kt | 10 ++++++---- .../kotlin/gradle/BaseMultiGradleVersionIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt | 2 +- .../jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 2 +- .../jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt | 2 +- 5 files changed, 10 insertions(+), 8 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 e468af1767b..1ee1aec8069 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,10 @@ import org.junit.Test import java.io.File -class KotlinAndroidGradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.0") -class KotlinAndroidWithJackGradleIT : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+") +class KotlinAndroidGradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "3.4", androidGradlePluginVersion = "2.3.0") +class KotlinAndroidWithJackGradleIT : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.4", androidGradlePluginVersion = "2.3.+") -class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "4.1-rc-1", androidGradlePluginVersion = "3.0.0-alpha8") { +class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "4.1-rc-1", androidGradlePluginVersion = "3.0.0-beta1") { @Test fun testApplyWithFeaturePlugin() { @@ -19,7 +19,9 @@ class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = project.setupWorkingDir() File(project.projectDir, "Lib/build.gradle").modify { text -> // Change the applied plugin to com.android.feature - text.replace("com.android.library", "com.android.feature").apply { assert(!equals(text)) } + text.replace("com.android.library", "com.android.feature") + .replace("compileSdkVersion 22", "compileSdkVersion 26") + .apply { assert(!equals(text)) } } // Check that Kotlin tasks were created for both lib and feature variants: diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt index 1d991b5abc9..d5f3d761128 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt @@ -12,6 +12,6 @@ abstract class BaseMultiGradleVersionIT : BaseGradleIT() { companion object { @JvmStatic @Parameters(name = "Test with Gradle version {0}") - fun params() = listOf("2.10", "2.14.1", "3.2", "3.3", "3.4", "4.0").map { arrayOf(it) } + fun params() = listOf("2.10", "2.14.1", "3.3", "3.4", "4.0").map { arrayOf(it) } } } \ No newline at end of file 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 a0433ca77f1..5e916a5bda3 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,7 +6,7 @@ import java.io.File class Kapt3Android30IT : Kapt3AndroidIT() { override val androidGradlePluginVersion: String - get() = "3.0.0-alpha8" + get() = "3.0.0-beta1" } open class Kapt3AndroidIT : Kapt3BaseIT() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 5bfdd5d2be8..1c035f09201 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -160,7 +160,7 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() { @Test fun testKotlinJsBuiltins() { - val project = Project("kotlinBuiltins", "3.2") + val project = Project("kotlinBuiltins", "4.0") project.setupWorkingDir() val buildGradle = File(project.projectDir, "app").getFileByName("build.gradle") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 6ef3b6c5048..1b1987374d6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -347,7 +347,7 @@ class KotlinGradleIT: BaseGradleIT() { @Test fun testKotlinBuiltins() { - val project = Project("kotlinBuiltins", "3.2") + val project = Project("kotlinBuiltins", "4.0") project.build("build") { assertSuccessful()