From 71e41b7c483946d8f57b4a6fa9c717d06a86d5f7 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Thu, 11 Mar 2021 21:31:33 +0300 Subject: [PATCH] Update Gradle verion in tests from 6.1 to 6.1.1 Gradle 6.1 is not suitable for testing because of memory leak on artefact validation (https://github.com/gradle/gradle/issues/11966) (cherry picked from commit 9c000000cf1421ff48bc0ecd2bc82bf3668c2d9e) --- .../idea/codeInsight/gradle/AbstractModelBuilderTest.java | 2 +- .../org/jetbrains/kotlin/gradle/GradleVersionRequired.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java index 596bc88420633..dfc538a9f4951 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java @@ -49,7 +49,7 @@ @RunWith(value = Parameterized.class) public abstract class AbstractModelBuilderTest { - public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}, {"5.6.4"}, {"6.1"}, {"6.5.1"}}; + public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}, {"5.6.4"}, {"6.1.1"}, {"6.5.1"}}; private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]"); diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt index 28d221df6f1fd..35e7de7b90486 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt @@ -22,9 +22,9 @@ import org.junit.Assume sealed class GradleVersionRequired(val minVersion: String, val maxVersion: String?) { companion object { - const val OLDEST_SUPPORTED = "6.1" + const val OLDEST_SUPPORTED = "6.1.1" - val FOR_MPP_SUPPORT = AtLeast("6.1") + val FOR_MPP_SUPPORT = AtLeast("6.1.1") } class Exact(version: String) : GradleVersionRequired(version, version)