From 68dc610814c5a893a152df4233f17ef99daebd42 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Mon, 25 Mar 2024 20:48:24 +0100 Subject: [PATCH] [gradle] Update gradle and AGP in test runs. (#4542) --- .github/workflows/gradle-plugin.yml | 4 ++-- gradle-plugins/gradle.properties | 9 ++------- gradle-plugins/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/gradle-plugin.yml b/.github/workflows/gradle-plugin.yml index 3c3da35dfa..b7ad41c330 100644 --- a/.github/workflows/gradle-plugin.yml +++ b/.github/workflows/gradle-plugin.yml @@ -17,8 +17,8 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04, macos-12, windows-2022] - gradle: [7.4, 8.3] - agp: [7.3.1, 8.2.2] + gradle: [7.4, 8.7] + agp: [7.3.1, 8.3.1] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index f05637f5b9..a9a089243e 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -19,13 +19,8 @@ compose.tests.js.compiler.compatible.kotlin.version=1.9.23 # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well # and Publish.Subtasks.buildTypes.gradle.GradlePluginTestKt#gradleVersions in the TC config # minimal and current gradle version -# -# !!! we can't update to the gradle upper than 8.3 because of on issue: -# https://github.com/gradle/gradle/issues/26912 -# It fails DesktopApplicationTest.proguard test on Windows -# Should be fixed in 8.7 -compose.tests.gradle.versions=7.4, 8.3 -compose.tests.agp.versions=7.3.1, 8.2.2 +compose.tests.gradle.versions=7.4, 8.7 +compose.tests.agp.versions=7.3.1, 8.3.1 # A version of Gradle plugin, that will be published, # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. diff --git a/gradle-plugins/gradle/wrapper/gradle-wrapper.properties b/gradle-plugins/gradle/wrapper/gradle-wrapper.properties index 17655d0ef2..48c0a02ca4 100644 --- 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists