Skip to content

Commit

Permalink
Merge pull request #1790 from google/ben/stable17
Browse files Browse the repository at this point in the history
Upgrade to Compose 1.7 stable
  • Loading branch information
bentrengrove authored Sep 5, 2024
2 parents 3b40d2b + 232badb commit 21b1e34
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: test-results-robolectric
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: test-results-robolectric
path: |
Expand Down Expand Up @@ -151,14 +151,14 @@ jobs:

- name: Upload logs
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: logs-${{ matrix.api-level }}-${{ steps.determine-target.outputs.TARGET }}-${{ matrix.shard }}
path: logcat.txt

- name: Upload test results
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: test-results-${{ matrix.api-level }}-${{ steps.determine-target.outputs.TARGET }}-${{ matrix.shard }}
path: |
Expand Down
92 changes: 0 additions & 92 deletions .github/workflows/device-tests.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Each [release](https://github.com/google/accompanist/releases) outlines what ver
<td>Compose UI 1.6 (1.6.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-permissions?versionPrefix=0.34"></td>
</tr>
<tr>
<td>Compose UI 1.7 (1.7.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-permissions"></td>
<td>Compose UI 1.7 & 1.8 (1.7.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-permissions?versionPrefix=0.36"></td>
</tr>
</table>

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000

GROUP=com.google.accompanist
# !! No longer need to update this manually when using a Compose SNAPSHOT
VERSION_NAME=0.35.3-SNAPSHOT
VERSION_NAME=0.36.0

POM_DESCRIPTION=Utilities for Jetpack Compose

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]

compose = "1.7.0-beta07"
compose = "1.7.0"
composeCompiler = "1.5.8"
composeMaterial3 = "1.0.1"
composesnapshot = "-" # a single character = no snapshot
Expand Down

0 comments on commit 21b1e34

Please sign in to comment.