From 60cf3b57407c376af00837b8adb21b115350908d Mon Sep 17 00:00:00 2001 From: Bingran Date: Fri, 11 Sep 2020 17:18:11 +0100 Subject: [PATCH] Upgradle agp version for ConfigurationCacheForAndroidIT The new agp version contains the fix regarding build listeners which will allow kgp run config caching test without warnings. Fixes: n/a Test: existing --- .../kotlin/gradle/ConfigurationCacheForAndroidIT.kt | 9 +-------- .../org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/util/AGPVersion.kt | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt index cccfd33da97..5192dd623b0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt @@ -18,14 +18,7 @@ class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() { androidHome = KotlinTestUtils.findAndroidSdk(), androidGradlePluginVersion = androidGradlePluginVersion, configurationCache = true, - /* AGP causes a configuration cache problem: - - plugin 'com.android.internal.application': registration of listener on 'TaskExecutionGraph.addTaskExecutionListener' is unsupported - - which causes tests to fail when configuration-cache-problems=fail is used. - However, everything works fine with WARN level reporting. - TODO: switch to FAIL when AGP no longer causes the cache problem - */ - configurationCacheProblems = ConfigurationCacheProblems.WARN + configurationCacheProblems = ConfigurationCacheProblems.FAIL ) @Test diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt index dac77cf94ac..67c99007564 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt @@ -52,7 +52,7 @@ abstract class AbstractConfigurationCacheIT : BaseGradleIT() { override fun defaultBuildOptions() = super.defaultBuildOptions().copy(configurationCache = true) - override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.AtLeast("6.6-rc-3") + override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.AtLeast("6.6.1") protected fun Project.testConfigurationCacheOf( vararg taskNames: String, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt index 5f65711949d..75b04c88c68 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt @@ -25,6 +25,6 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) { val v3_4_1 = fromString("3.4.1") val v3_6_0 = fromString("3.6.0") val v4_1_0 = fromString("4.1.0-beta02") - val v4_2_0 = fromString("4.2.0-alpha07") + val v4_2_0 = fromString("4.2.0-alpha10") } } \ No newline at end of file