Skip to content

Commit

Permalink
[gradle] Update gradle and AGP in test runs. (#4542)
Browse files Browse the repository at this point in the history
  • Loading branch information
terrakok committed Mar 25, 2024
1 parent 3975a50 commit 68dc610
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 2 additions & 7 deletions gradle-plugins/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 68dc610

Please sign in to comment.