Skip to content

Commit

Permalink
Merge pull request #1324 from google/ben/upgrade_beta02
Browse files Browse the repository at this point in the history
Upgrade to Compose 1.3.0-beta02
  • Loading branch information
bentrengrove committed Sep 9, 2022
2 parents 41cc81d + de4df88 commit 13e890a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/build.yml
Expand Up @@ -82,7 +82,7 @@ jobs:
# Allow tests to continue on other devices if they fail on one device.
fail-fast: false
matrix:
api-level: [ 22, 26, 29, 31, 32 ]
api-level: [ 22, 26, 29, 31 ]
shard: [ 0, 1 ] # Need to update shard-count below if this changes

env:
Expand Down Expand Up @@ -128,12 +128,21 @@ jobs:
TARGET="google_apis"
fi
echo "::set-output name=TARGET::$TARGET"
- name: Determine emulator arch
id: determine-arch
env:
API_LEVEL: ${{ matrix.api-level }}
run: |
ARCH="x86"
if [ "$API_LEVEL" -ge "31" ]; then
ARCH="x86_64"
fi
echo "::set-output name=ARCH::$ARCH"
- name: Run tests
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ matrix.api-level }}
arch: x86_64
arch: ${{ steps.determine-arch.outputs.ARCH }}
target: ${{ steps.determine-target.outputs.TARGET }}
profile: Galaxy Nexus
script: ./scripts/run-tests.sh --log-file=logcat.txt --run-affected --affected-base-ref=$BASE_REF --shard-index=${{ matrix.shard }} --shard-count=2
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
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.26.3-SNAPSHOT
VERSION_NAME=0.26.3-beta

POM_DESCRIPTION=Utilities for Jetpack Compose

Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
@@ -1,7 +1,7 @@
[versions]

compose = "1.3.0-beta01"
composeCompiler = "1.3.0"
compose = "1.3.0-beta02"
composeCompiler = "1.3.1"
composesnapshot = "-" # a single character = no snapshot

# gradlePlugin and lint need to be updated together
Expand Down

0 comments on commit 13e890a

Please sign in to comment.