diff --git a/.github/workflows/build-snapshot.yml b/.github/workflows/build-snapshot.yml index 07924363b..9f09e694d 100644 --- a/.github/workflows/build-snapshot.yml +++ b/.github/workflows/build-snapshot.yml @@ -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: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08333e6fa..bcbba65e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | @@ -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: | diff --git a/.github/workflows/device-tests.yml b/.github/workflows/device-tests.yml deleted file mode 100644 index e459ed086..000000000 --- a/.github/workflows/device-tests.yml +++ /dev/null @@ -1,92 +0,0 @@ -name: Instrumented tests on device - -on: - schedule: - # Run this twice per day, at 6:13 and 16:13 - - cron: '13 6,16 * * *' - - # Also run this workflow whenever we update this file - push: - paths: - - '.github/workflows/device-tests.yml' - -jobs: - android-test: - runs-on: macos-latest - if: github.repository == 'google/accompanist' - timeout-minutes: 80 - - strategy: - # Allow tests to continue on other devices if they fail on one device. - fail-fast: false - matrix: - api-level: [ 22, 26, 28, 29 ] - shard: [ 0, 1, 2 ] # Need to update shard-count below if this changes - - steps: - - uses: actions/checkout@v2 - - - name: Copy CI gradle.properties - run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - - name: set up JDK - uses: actions/setup-java@v1 - with: - java-version: 17 - - - name: Decrypt secrets - run: release/signing-setup.sh ${{ secrets.ENCRYPT_KEY }} - - - name: Generate cache key - run: ./checksum.sh checksum.txt - - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches/modules-* - ~/.gradle/caches/jars-* - ~/.gradle/caches/build-cache-* - key: gradle-${{ hashFiles('checksum.txt') }} - - # Determine what emulator image to use. We run all API 29+ emulators using - # the google_apis image - - name: Determine emulator target - id: determine-target - env: - API_LEVEL: ${{ matrix.api-level }} - run: | - TARGET="default" - if [ "$API_LEVEL" -ge "29" ]; then - TARGET="google_apis" - fi - echo "TARGET=$TARGET" >> $GITHUB_OUTPUT - - - name: Run device tests - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: ${{ matrix.api-level }} - target: ${{ steps.determine-target.outputs.TARGET }} - profile: Galaxy Nexus - emulator-build: 7425822 # https://github.com/ReactiveCircus/android-emulator-runner/issues/160 - # We run all tests, sharding them over 3 shards - script: ./scripts/run-tests.sh --log-file=logcat.txt --shard-index=${{ matrix.shard }} --shard-count=3 - - - name: Clean secrets - if: always() - run: release/signing-cleanup.sh - - - name: Upload logs - if: always() - uses: actions/upload-artifact@v2 - 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 - with: - name: test-results-${{ matrix.api-level }}-${{ steps.determine-target.outputs.TARGET }}-${{ matrix.shard }} - path: | - **/build/reports/* - **/build/outputs/*/connected/* diff --git a/README.md b/README.md index 008e3f517..7ddb0a712 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Each [release](https://github.com/google/accompanist/releases) outlines what ver Compose UI 1.6 (1.6.x)Maven Central - Compose UI 1.7 (1.7.x)Maven Central + Compose UI 1.7 & 1.8 (1.7.x)Maven Central diff --git a/gradle.properties b/gradle.properties index cdecec840..bae275699 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2fcdafbc5..049acc236 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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