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 981c10831f8..903a2bbaf9e 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 @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.gradle.testbase.TestVersions.AGP.AGP_42 import org.junit.jupiter.api.DisplayName @DisplayName("Configuration cache in Android project") -@GradleTestVersions(minVersion = TestVersions.Gradle.G_6_7) @JvmGradlePluginTests class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() { override val defaultBuildOptions = super.defaultBuildOptions.copy( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt index 7a11b9dd89b..c1db201d727 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.gradle.utils.minSupportedGradleVersion interface TestVersions { object Gradle { - const val G_6_7 = "6.7.1" const val G_6_8 = "6.8.3" const val G_6_9 = "6.9.2" const val G_7_0 = "7.0.2" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/argumentProviders.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/argumentProviders.kt index 3e70d0dbac1..644147d1f64 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/argumentProviders.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/argumentProviders.kt @@ -136,7 +136,7 @@ class GradleAndJdkArgumentsProvider : GradleArgumentsProvider() { companion object { private val jdkGradleCompatibilityMatrix = mapOf( - JavaVersion.VERSION_15 to GradleVersion.version(TestVersions.Gradle.G_6_7), + JavaVersion.VERSION_15 to GradleVersion.version(TestVersions.Gradle.G_6_8), JavaVersion.VERSION_16 to GradleVersion.version(TestVersions.Gradle.G_7_0), JavaVersion.VERSION_17 to GradleVersion.version(TestVersions.Gradle.G_7_3) ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KaptGenerateStubsConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KaptGenerateStubsConfig.kt index d10ddf2afac..a9b86b59a5e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KaptGenerateStubsConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KaptGenerateStubsConfig.kt @@ -138,9 +138,8 @@ internal class KaptGenerateStubsConfig : BaseKotlinCompileConfig isSatisfiedBy(elem.file) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt index fb15d959509..e884becb220 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt @@ -31,7 +31,7 @@ import org.gradle.util.GradleVersion import java.io.File import java.io.Serializable -const val minSupportedGradleVersion = "6.7.1" +const val minSupportedGradleVersion = "6.8.3" internal fun checkGradleCompatibility( withComponent: String = "the Kotlin Gradle plugin",