diff --git a/.github/workflows/test-snapshot.yml b/.github/workflows/test-snapshot.yml deleted file mode 100644 index 13183d3de..000000000 --- a/.github/workflows/test-snapshot.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Build and Test a Compose snapshot - -on: - workflow_dispatch: - inputs: - snapshotID: - required: true - type: string - composeVersion: - required: true - type: string -env: - compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} -concurrency: - group: ${{ inputs.name }}-build-${{ github.ref }} - cancel-in-progress: true - -jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Copy CI gradle.properties - run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: 'zulu' - - - name: Check snapshot - working-directory: ${{ inputs.path }} - run: ./scripts/test_snapshot.sh $CI_COMPOSE_VERSION $CI_COMPOSE_SNAPSHOT - env: - CI_COMPOSE_VERSION: ${{ inputs.composeVersion }} - CI_COMPOSE_SNAPSHOT: ${{ inputs.snapshotID }} - - - name: Upload build reports - if: always() - uses: actions/upload-artifact@v4 - with: - name: build-reports - path: ${{ inputs.path }}/app/build/reports diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update_deps.yml index e1720ec60..dd303d833 100644 --- a/.github/workflows/update_deps.yml +++ b/.github/workflows/update_deps.yml @@ -22,8 +22,6 @@ jobs: - name: Update dependencies run: ./scripts/updateDeps.sh - - name: Duplicate version configuration - run: ./scripts/duplicate_version_config.sh - name: Create pull request id: cpr uses: peter-evans/create-pull-request@v7 diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index d40115dfa..a479a1f40 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -1,21 +1,17 @@ -##### -# This file is duplicated to individual samples from the global scripts/libs.versions.toml -# Do not add a dependency to an individual sample, edit the global version instead. -##### [versions] accompanist = "0.37.3" -android-material3 = "1.13.0-alpha13" -androidGradlePlugin = "8.10.0" +android-material3 = "1.14.0-alpha01" +androidGradlePlugin = "8.10.1" androidx-activity-compose = "1.10.1" -androidx-appcompat = "1.7.0" -androidx-compose-bom = "2025.05.00" +androidx-appcompat = "1.7.1" +androidx-compose-bom = "2025.06.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.16.0" androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.9.0" -androidx-lifecycle-runtime-compose = "2.9.0" +androidx-lifecycle-compose = "2.9.1" +androidx-lifecycle-runtime-compose = "2.9.1" androidx-navigation = "2.9.0" androidx-palette = "1.0.0" androidx-test = "1.6.1" @@ -25,7 +21,7 @@ androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.0" androidx-wear-compose = "1.4.1" -androidx-window = "1.3.0" +androidx-window = "1.4.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -39,21 +35,21 @@ hiltExt = "1.2.0" horologist = "0.6.23" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.1.20" +kotlin = "2.1.21" kotlinx-serialization-json = "1.8.1" -kotlinx_immutable = "0.3.8" -ksp = "2.1.20-2.0.1" +kotlinx_immutable = "0.4.0" +ksp = "2.1.21-2.0.2" maps-compose = "6.6.0" # @keep minSdk = "21" okhttp = "4.12.0" play-services-wearable = "19.0.0" robolectric = "4.14.1" -roborazzi = "1.43.1" +roborazzi = "1.44.0" rome = "2.1.0" room = "2.7.1" secrets = "2.0.1" -spotless = "7.0.3" +spotless = "7.0.4" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index d40115dfa..147fbd99b 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -4,18 +4,18 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.13.0-alpha13" -androidGradlePlugin = "8.10.0" +android-material3 = "1.14.0-alpha01" +androidGradlePlugin = "8.10.1" androidx-activity-compose = "1.10.1" -androidx-appcompat = "1.7.0" -androidx-compose-bom = "2025.05.00" +androidx-appcompat = "1.7.1" +androidx-compose-bom = "2025.06.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.16.0" androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.9.0" -androidx-lifecycle-runtime-compose = "2.9.0" +androidx-lifecycle-compose = "2.9.1" +androidx-lifecycle-runtime-compose = "2.9.1" androidx-navigation = "2.9.0" androidx-palette = "1.0.0" androidx-test = "1.6.1" @@ -25,7 +25,7 @@ androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.0" androidx-wear-compose = "1.4.1" -androidx-window = "1.3.0" +androidx-window = "1.4.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -39,21 +39,21 @@ hiltExt = "1.2.0" horologist = "0.6.23" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.1.20" +kotlin = "2.1.21" kotlinx-serialization-json = "1.8.1" -kotlinx_immutable = "0.3.8" -ksp = "2.1.20-2.0.1" +kotlinx_immutable = "0.4.0" +ksp = "2.1.21-2.0.2" maps-compose = "6.6.0" # @keep minSdk = "21" okhttp = "4.12.0" play-services-wearable = "19.0.0" robolectric = "4.14.1" -roborazzi = "1.43.1" +roborazzi = "1.44.0" rome = "2.1.0" room = "2.7.1" secrets = "2.0.1" -spotless = "7.0.3" +spotless = "7.0.4" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index eaa4e1d81..77c1d115d 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -4,18 +4,18 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.13.0-alpha13" -androidGradlePlugin = "8.10.0" +android-material3 = "1.13.0-alpha14" +androidGradlePlugin = "8.10.1" androidx-activity-compose = "1.10.1" -androidx-appcompat = "1.7.0" -androidx-compose-bom = "2025.05.00" +androidx-appcompat = "1.7.1" +androidx-compose-bom = "2025.06.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.16.0" androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.9.0" -androidx-lifecycle-runtime-compose = "2.9.0" +androidx-lifecycle-compose = "2.9.1" +androidx-lifecycle-runtime-compose = "2.9.1" androidx-navigation = "2.9.0" androidx-palette = "1.0.0" androidx-test = "1.6.1" @@ -24,9 +24,9 @@ androidx-test-ext-junit = "1.2.1" androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.0" -androidx-wear-compose-material3 = "1.5.0-beta01" -androidx-wear-compose = "1.5.0-beta01" -androidx-window = "1.3.0" +androidx-wear-compose-material3 = "1.5.0-beta03" +androidx-wear-compose = "1.5.0-beta03" +androidx-window = "1.4.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -40,22 +40,22 @@ hiltExt = "1.2.0" horologist = "0.7.14-beta" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.1.20" +kotlin = "2.1.21" kotlinx-serialization-json = "1.8.1" -kotlinx_immutable = "0.3.8" -ksp = "2.1.20-2.0.1" +kotlinx_immutable = "0.4.0" +ksp = "2.1.21-2.0.2" maps-compose = "6.6.0" -media3 = "1.6.1" +media3 = "1.7.1" # @keep minSdk = "21" okhttp = "4.12.0" play-services-wearable = "19.0.0" robolectric = "4.14.1" -roborazzi = "1.43.1" +roborazzi = "1.44.0" rome = "2.1.0" room = "2.7.1" secrets = "2.0.1" -spotless = "7.0.3" +spotless = "7.0.4" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/Jetcaster/gradle/wrapper/gradle-wrapper.properties b/Jetcaster/gradle/wrapper/gradle-wrapper.properties index d6c8bc7bf..b889d1192 100644 --- a/Jetcaster/gradle/wrapper/gradle-wrapper.properties +++ b/Jetcaster/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index d40115dfa..147fbd99b 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -4,18 +4,18 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.13.0-alpha13" -androidGradlePlugin = "8.10.0" +android-material3 = "1.14.0-alpha01" +androidGradlePlugin = "8.10.1" androidx-activity-compose = "1.10.1" -androidx-appcompat = "1.7.0" -androidx-compose-bom = "2025.05.00" +androidx-appcompat = "1.7.1" +androidx-compose-bom = "2025.06.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.16.0" androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.9.0" -androidx-lifecycle-runtime-compose = "2.9.0" +androidx-lifecycle-compose = "2.9.1" +androidx-lifecycle-runtime-compose = "2.9.1" androidx-navigation = "2.9.0" androidx-palette = "1.0.0" androidx-test = "1.6.1" @@ -25,7 +25,7 @@ androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.0" androidx-wear-compose = "1.4.1" -androidx-window = "1.3.0" +androidx-window = "1.4.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -39,21 +39,21 @@ hiltExt = "1.2.0" horologist = "0.6.23" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.1.20" +kotlin = "2.1.21" kotlinx-serialization-json = "1.8.1" -kotlinx_immutable = "0.3.8" -ksp = "2.1.20-2.0.1" +kotlinx_immutable = "0.4.0" +ksp = "2.1.21-2.0.2" maps-compose = "6.6.0" # @keep minSdk = "21" okhttp = "4.12.0" play-services-wearable = "19.0.0" robolectric = "4.14.1" -roborazzi = "1.43.1" +roborazzi = "1.44.0" rome = "2.1.0" room = "2.7.1" secrets = "2.0.1" -spotless = "7.0.3" +spotless = "7.0.4" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 13625c536..d6388b12b 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -4,18 +4,18 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.13.0-alpha13" -androidGradlePlugin = "8.10.0" +android-material3 = "1.14.0-alpha01" +androidGradlePlugin = "8.10.1" androidx-activity-compose = "1.10.1" -androidx-appcompat = "1.7.0" -androidx-compose-bom = "2025.05.00" +androidx-appcompat = "1.7.1" +androidx-compose-bom = "2025.06.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.16.0" androidx-glance = "1.2.0-alpha01" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.9.0" -androidx-lifecycle-runtime-compose = "2.9.0" +androidx-lifecycle-compose = "2.9.1" +androidx-lifecycle-runtime-compose = "2.9.1" androidx-navigation = "2.9.0" androidx-palette = "1.0.0" androidx-test = "1.6.1" @@ -25,7 +25,7 @@ androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.0" androidx-wear-compose = "1.4.1" -androidx-window = "1.3.0" +androidx-window = "1.4.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -39,21 +39,21 @@ hiltExt = "1.2.0" horologist = "0.6.23" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.1.20" +kotlin = "2.1.21" kotlinx-serialization-json = "1.8.1" -kotlinx_immutable = "0.3.8" -ksp = "2.1.20-2.0.1" +kotlinx_immutable = "0.4.0" +ksp = "2.1.21-2.0.2" maps-compose = "6.6.0" # @keep minSdk = "21" okhttp = "4.12.0" play-services-wearable = "19.0.0" robolectric = "4.14.1" -roborazzi = "1.43.1" +roborazzi = "1.44.0" rome = "2.1.0" room = "2.7.1" secrets = "2.0.1" -spotless = "7.0.3" +spotless = "7.0.4" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/README.md b/README.md index 0c4431e72..bb9fb920e 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ To update dependencies to their new stable versions, run: ./scripts/updateDeps.sh ``` -To make any other manual updates to dependencies (ie add a new dependency or set an alpha version), update the `/scripts/libs.versions.toml` file with changes, and then run `duplicate_version_config.sh` to propogate the changes to all other samples. You can also update the `toml-updater-config.gradle` file with changes that need to propogate to each sample. +Any other version updates need to be made individually. ## Obsolete Sample Projects diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index d40115dfa..147fbd99b 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -4,18 +4,18 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.13.0-alpha13" -androidGradlePlugin = "8.10.0" +android-material3 = "1.14.0-alpha01" +androidGradlePlugin = "8.10.1" androidx-activity-compose = "1.10.1" -androidx-appcompat = "1.7.0" -androidx-compose-bom = "2025.05.00" +androidx-appcompat = "1.7.1" +androidx-compose-bom = "2025.06.00" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.16.0" androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.9.0" -androidx-lifecycle-runtime-compose = "2.9.0" +androidx-lifecycle-compose = "2.9.1" +androidx-lifecycle-runtime-compose = "2.9.1" androidx-navigation = "2.9.0" androidx-palette = "1.0.0" androidx-test = "1.6.1" @@ -25,7 +25,7 @@ androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.0" androidx-wear-compose = "1.4.1" -androidx-window = "1.3.0" +androidx-window = "1.4.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -39,21 +39,21 @@ hiltExt = "1.2.0" horologist = "0.6.23" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.1.20" +kotlin = "2.1.21" kotlinx-serialization-json = "1.8.1" -kotlinx_immutable = "0.3.8" -ksp = "2.1.20-2.0.1" +kotlinx_immutable = "0.4.0" +ksp = "2.1.21-2.0.2" maps-compose = "6.6.0" # @keep minSdk = "21" okhttp = "4.12.0" play-services-wearable = "19.0.0" robolectric = "4.14.1" -roborazzi = "1.43.1" +roborazzi = "1.44.0" rome = "2.1.0" room = "2.7.1" secrets = "2.0.1" -spotless = "7.0.3" +spotless = "7.0.4" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/scripts/duplicate_version_config.sh b/scripts/duplicate_version_config.sh deleted file mode 100755 index 9ab216c79..000000000 --- a/scripts/duplicate_version_config.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2022 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -######################################################################## -# -# Duplicates libs.versions.toml into each sample from master copy. -# -# Example: To run build over all projects run: -# ./scripts/duplicate_version_config.sh -# -######################################################################## - -set -xe - -cp scripts/libs.versions.toml Jetcaster/gradle/libs.versions.toml -cp scripts/libs.versions.toml Jetchat/gradle/libs.versions.toml -cp scripts/libs.versions.toml JetLagged/gradle/libs.versions.toml -cp scripts/libs.versions.toml JetNews/gradle/libs.versions.toml -cp scripts/libs.versions.toml Jetsnack/gradle/libs.versions.toml -cp scripts/libs.versions.toml Reply/gradle/libs.versions.toml - -cp scripts/toml-updater-config.gradle Jetcaster/buildscripts/toml-updater-config.gradle -cp scripts/toml-updater-config.gradle Jetchat/buildscripts/toml-updater-config.gradle -cp scripts/toml-updater-config.gradle JetLagged/buildscripts/toml-updater-config.gradle -cp scripts/toml-updater-config.gradle JetNews/buildscripts/toml-updater-config.gradle -cp scripts/toml-updater-config.gradle Jetsnack/buildscripts/toml-updater-config.gradle -cp scripts/toml-updater-config.gradle Reply/buildscripts/toml-updater-config.gradle - -# TODO: Figure out a way of copying the spotless config into each project following -# this PR: https://github.com/android/compose-samples/pull/1549 - -#cp scripts/init.gradle.kts Jetcaster/buildscripts/init.gradle.kts -#cp scripts/init.gradle.kts Jetchat/buildscripts/init.gradle.kts -#cp scripts/init.gradle.kts JetLagged/buildscripts/init.gradle.kts -#cp scripts/init.gradle.kts JetNews/buildscripts/init.gradle.kts -#cp scripts/init.gradle.kts Jetsnack/buildscripts/init.gradle.kts -#cp scripts/init.gradle.kts Reply/buildscripts/init.gradle.kts \ No newline at end of file diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index 13625c536..e69de29bb 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -1,179 +0,0 @@ -##### -# This file is duplicated to individual samples from the global scripts/libs.versions.toml -# Do not add a dependency to an individual sample, edit the global version instead. -##### -[versions] -accompanist = "0.37.3" -android-material3 = "1.13.0-alpha13" -androidGradlePlugin = "8.10.0" -androidx-activity-compose = "1.10.1" -androidx-appcompat = "1.7.0" -androidx-compose-bom = "2025.05.00" -androidx-constraintlayout = "1.1.1" -androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.16.0" -androidx-glance = "1.2.0-alpha01" -androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.9.0" -androidx-lifecycle-runtime-compose = "2.9.0" -androidx-navigation = "2.9.0" -androidx-palette = "1.0.0" -androidx-test = "1.6.1" -androidx-test-espresso = "3.6.1" -androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.6.0" -androidx-tv-foundation = "1.0.0-alpha12" -androidx-tv-material = "1.0.0" -androidx-wear-compose = "1.4.1" -androidx-window = "1.3.0" -androidxHiltNavigationCompose = "1.2.0" -androix-test-uiautomator = "2.3.0" -coil = "2.7.0" -# @keep -compileSdk = "35" -coroutines = "1.10.2" -google-maps = "19.2.0" -gradle-versions = "0.52.0" -hilt = "2.56.2" -hiltExt = "1.2.0" -horologist = "0.6.23" -jdkDesugar = "2.1.5" -junit = "4.13.2" -kotlin = "2.1.20" -kotlinx-serialization-json = "1.8.1" -kotlinx_immutable = "0.3.8" -ksp = "2.1.20-2.0.1" -maps-compose = "6.6.0" -# @keep -minSdk = "21" -okhttp = "4.12.0" -play-services-wearable = "19.0.0" -robolectric = "4.14.1" -roborazzi = "1.43.1" -rome = "2.1.0" -room = "2.7.1" -secrets = "2.0.1" -spotless = "7.0.3" -# @keep -targetSdk = "33" -version-catalog-update = "1.0.0" -glancePreview = "1.1.1" - -[libraries] -accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -android-material3 = { module = "com.google.android.material:material", version.ref = "android-material3" } -androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } -androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } -androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-compose-animation = { module = "androidx.compose.animation:animation" } -androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } -androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } -androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } -androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" } -androidx-compose-material3 = { module = "androidx.compose.material3:material3" } -androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" } -androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout" } -androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation" } -androidx-compose-material3-adaptive-navigationSuite = { module = "androidx.compose.material3:material3-adaptive-navigation-suite" } -androidx-compose-materialWindow = { module = "androidx.compose.material3:material3-window-size-class" } -androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } -androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } -androidx-compose-ui = { module = "androidx.compose.ui:ui" } -androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" } -androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" } -androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" } -androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } -androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } -androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } -androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } -androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } -androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } -androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } -androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-core-splashscreen" } -androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } -androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } -androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } -androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } -androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } -androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-compose" } -androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" } -androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" } -androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } -androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle-compose" } -androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" } -androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" } -androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" } -androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" } -androidx-palette = { module = "androidx.palette:palette", version.ref = "androidx-palette" } -androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } -androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } -androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } -androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" } -androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" } -androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" } -androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-ext-truth" } -androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } -androidx-test-runner = "androidx.test:runner:1.6.2" -androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androix-test-uiautomator" } -androidx-tv-foundation = { module = "androidx.tv:tv-foundation", version.ref = "androidx-tv-foundation" } -androidx-tv-material = { module = "androidx.tv:tv-material", version.ref = "androidx-tv-material" } -androidx-wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" } -androidx-wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "androidx-wear-compose" } -androidx-wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "androidx-wear-compose" } -androidx-wear-compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "androidx-wear-compose" } -androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" } -androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" } -coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } -core-jdk-desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "jdkDesugar" } -dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" } -googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" } -googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" } -hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } -hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } -hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } -hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" } -horologist-audio-ui = { module = "com.google.android.horologist:horologist-audio-ui", version.ref = "horologist" } -horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" } -horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" } -horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" } -horologist-compose-tools = { module = "com.google.android.horologist:horologist-compose-tools", version.ref = "horologist" } -horologist-images-coil = { module = "com.google.android.horologist:horologist-images-coil", version.ref = "horologist" } -horologist-media-data = { module = "com.google.android.horologist:horologist-media-data", version.ref = "horologist" } -horologist-media-ui = { module = "com.google.android.horologist:horologist-media-ui", version.ref = "horologist" } -horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" } -junit = { module = "junit:junit", version.ref = "junit" } -kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } -kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" } -kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } -kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" } -okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" } -okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } -play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "play-services-wearable" } -robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } -roborazzi = { module = "io.github.takahirom.roborazzi:roborazzi", version.ref = "roborazzi" } -roborazzi-compose = { module = "io.github.takahirom.roborazzi:roborazzi-compose", version.ref = "roborazzi" } -roborazzi-rule = { module = "io.github.takahirom.roborazzi:roborazzi-junit-rule", version.ref = "roborazzi" } -rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome" } -rometools-rome = { module = "com.rometools:rome", version.ref = "rome" } -androidx-glance-preview = { group = "androidx.glance", name = "glance-preview", version.ref = "glancePreview" } - -[plugins] -android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } -android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } -android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" } -compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" } -hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } -kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" } -secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" } -spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } -version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" } diff --git a/scripts/test_snapshot.sh b/scripts/test_snapshot.sh deleted file mode 100755 index f0694d9db..000000000 --- a/scripts/test_snapshot.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2022 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -######################################################################## -# -# Allows testing a snapshot version across all samples -# -# Example: To run build over all projects run: -# ./scripts/test_snapshot.sh -# -######################################################################## -set -xe - -if [ -z "$1" ]; then - read -p "Enter compose version e.g. 1.3.0: " compose_ver -else - echo "Using compose version: $1" - compose_ver=$1 -fi -if [ -z "$2" ]; then - read -p "Enter snapshot ID: " snapshot -else - echo "Using compose snapshot: $2" - snapshot=$2 -fi -export COMPOSE_SNAPSHOT_ID=$snapshot - -# Switch version to SNAPSHOT -cp ./scripts/libs.versions.toml ./scripts/libs.versions.toml.tmp -if [[ "$OSTYPE" == "darwin"* ]]; then - sed -i '' -e 's/^compose = ".*"/compose = "'$compose_ver'-SNAPSHOT"/g' ./scripts/libs.versions.toml -else - sed -i -e 's/^compose = ".*"/compose = "'$compose_ver'-SNAPSHOT"/g' ./scripts/libs.versions.toml -fi - -# Copy to all samples and verify -./scripts/duplicate_version_config.sh -./scripts/verify_samples.sh -./scripts/gradlew_recursive.sh testDebug --stacktrace - -# Undo all changes -mv ./scripts/libs.versions.toml.tmp ./scripts/libs.versions.toml -./scripts/duplicate_version_config.sh diff --git a/scripts/updateDeps.sh b/scripts/updateDeps.sh index d0fc36d77..7aa333781 100755 --- a/scripts/updateDeps.sh +++ b/scripts/updateDeps.sh @@ -16,8 +16,9 @@ ######################################################################## # -# Updates dependencies using Reply as the source of truth (then copies Reply's -# output into each sample) +# Updates dependencies for all Compose samples +# Note: Jetcaster is temporarily excluded as it is using alpha libraries +# which we don't want to upgrade in parallel with stable releases. # # Example: To run build over all projects run: # ./scripts/updateDeps.sh @@ -26,7 +27,8 @@ set -xe -./Jetcaster/gradlew -p ./Jetcaster versionCatalogUpdate - -cp Jetcaster/gradle/libs.versions.toml scripts/libs.versions.toml -./scripts/duplicate_version_config.sh +cd Jetchat; ./gradlew versionCatalogUpdate; cd .. +cd JetLagged; ./gradlew versionCatalogUpdate; cd .. +cd JetNews; ./gradlew versionCatalogUpdate; cd .. +cd Jetsnack; ./gradlew versionCatalogUpdate; cd .. +cd Reply; ./gradlew versionCatalogUpdate; cd ..