Set the minimal supported Gradle version to 7.1

Author: hsz

.github/workflows/reusable-integrationTests.yml

@@ -55,8 +55,7 @@ jobs:
       fail-fast: false
       matrix:
         gradleVersion:
-          - 6.8
-          - 6.9.3
+          - 7.1
           - 7.6
         os:
           - windows-latest

.github/workflows/reusable-unitTests.yml

@@ -30,8 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         gradleVersion:
-          - 6.8
-          - 6.9.3
+          - 7.1
           - 7.6
         os:
           - windows-latest

.teamcity/settings.kts

@@ -43,7 +43,7 @@ project {
 
 
 object UnitTests : BuildType({
-    val gradleVersions = listOf("6.8", "6.9.3", "7.6")
+    val gradleVersions = listOf("7.1", "7.6")
 
     name = "Unit Tests"
 

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [next]
 
+### Changed
+- Set minimum supported Gradle version from `6.8` to `7.1`
+
 ### Fixed
 - Fixed "Error: Could not find or load main class" when using older SDK versions
 - Fix launch information could not be found for macOS. [#1230](../../issues/1230)

gradle.properties

@@ -20,7 +20,7 @@ ossrhUsername=
 ossrhPassword=
 pluginsRepository=https://cache-redirector.jetbrains.com/plugins.jetbrains.com/maven
 
-gradleVersion=7.6
+gradleVersion=7.1
 kotlinVersion=1.7.22
 
 testGradleVersion=

integration-tests/README.md

@@ -13,8 +13,7 @@ Each of the Integration Tests is a standalone project that focuses on a specific
 Running Integration Tests is based on GitHub Actions and makes use of the matrix build so that we can run all tests with variations of different properties:
 - Operating systems: macOS, Windows, Linux
 - Gradle versions:
-  - first supported: `6.8`
-  - last from `6.x` branch: `6.9.3`
+  - first supported: `7.1`
   - latest available: `7.6`
 - IntelliJ IDEA SDK versions:
   - latest stable: `2021.3.3`

src/main/kotlin/org/jetbrains/intellij/IntelliJPluginConstants.kt

@@ -50,7 +50,7 @@ object IntelliJPluginConstants {
 
     const val ANNOTATIONS_DEPENDENCY_VERSION = "23.0.0"
     const val DEFAULT_IDEA_VERSION = "LATEST-EAP-SNAPSHOT"
-    const val MINIMAL_SUPPORTED_GRADLE_VERSION = "6.8"
+    const val MINIMAL_SUPPORTED_GRADLE_VERSION = "7.1"
 
     const val RELEASE_SUFFIX_EAP = "-EAP-SNAPSHOT"
     const val RELEASE_SUFFIX_EAP_CANDIDATE = "-EAP-CANDIDATE-SNAPSHOT"

src/test/kotlin/org/jetbrains/intellij/IntelliJPluginSpec.kt

@@ -575,50 +575,13 @@ class IntelliJPluginSpec : IntelliJPluginSpecBase() {
         }
     }
 
-//    /**
-//     * Note: An older version of `kotlin("jvm")` is because 1.7.+ requires Gradle 7.1.
-//     *
-//     * (specifically `kotlin("jvm")` requires the method [org.gradle.api.plugins.JavaPluginExtension.getSourceSets])
-//     */
-//    @Test
-//    fun `expect successful build using minimal supported Gradle version`() {
-//
-//        buildFile.writeText("") // reset the build file - need to apply an older version of Kotlin plugin
-//        buildFile.groovy(
-//            """
-//            plugins {
-//                id 'org.jetbrains.intellij'
-//                id 'org.jetbrains.kotlin.jvm' version '1.4.20'
-//            }
-//            sourceCompatibility = 11
-//            targetCompatibility = 11
-//            repositories {
-//                mavenCentral()
-//            }
-//            intellij {
-//                version = '$intellijVersion'
-//                downloadSources = false
-//                pluginsRepositories {
-//                    maven('$pluginsRepository')
-//                }
-//                instrumentCode = false
-//            }
-//            buildSearchableOptions {
-//                enabled = false
-//            }
-//
-//            // Define tasks with a minimal set of tasks required to build a source set
-//            sourceSets.all {
-//                task(it.getTaskName('build', 'SourceSet'), dependsOn: it.output)
-//            }
-//        """.trimIndent()
-//        )
-//
-//        val buildResult = build(MINIMAL_SUPPORTED_GRADLE_VERSION, false, "help")
-//
-//        assertContains("BUILD SUCCESSFUL", buildResult.output)
-//        assertNotContains("Gradle IntelliJ Plugin requires Gradle", buildResult.output)
-//    }
+    @Test
+    fun `expect successful build using minimal supported Gradle version`() {
+        val buildResult = build(MINIMAL_SUPPORTED_GRADLE_VERSION, false, "help")
+
+        assertContains("BUILD SUCCESSFUL", buildResult.output)
+        assertNotContains("Gradle IntelliJ Plugin requires Gradle", buildResult.output)
+    }
 
     @SuppressWarnings("GrEqualsBetweenInconvertibleTypes")
     fun assertPathParameters(testCommand: ProcessProperties, sandboxPath: String) {