Update gradle in project to 8.6

JetBrains · Feb 16, 2024 · a96410a · a96410a
1 parent 4336b21
commit a96410a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts
@@ -160,7 +160,13 @@ for (gradleVersion in supportedGradleVersions) {
             filter { includeTestsMatching(gradleTestsPattern) }
             dependsOn(downloadJdksForTests)
 
-            //e.g. AGP 7 doesn't support Gradle 8+
+            /*
+             * Fixes this kind of error:
+             * What went wrong:
+             * An exception occurred applying plugin request [id: 'com.android.application', version: '8.2.2']
+             * > Failed to apply plugin 'com.android.internal.version-check'.
+             * > Minimum supported Gradle version is 8.2. Current version is 7.4.
+             */
             val agpMajor = agpVersion.split('.').first().toInt()
             val gradleMajor = gradleVersion.split('.').first().toInt()
             onlyIf { agpMajor <= gradleMajor }

diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
@@ -11,7 +11,8 @@ compose.tests.compiler.compatible.kotlin.version=1.9.22
 compose.tests.js.compiler.compatible.kotlin.version=1.9.22
 # __SUPPORTED_GRADLE_VERSIONS__
 # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well
-compose.tests.gradle.versions=7.4, 8.3, 8.6
+# minimal and current gradle version
+compose.tests.gradle.versions=7.4, 8.6
 compose.tests.agp.versions=7.3.1, 8.2.2
 
 # A version of Gradle plugin, that will be published,

diff --git a/gradle-plugins/gradle/wrapper/gradle-wrapper.properties b/gradle-plugins/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists