diff --git a/.github/workflows/android_test.yml b/.github/workflows/android_test.yml index ee681ae2f8..07905d6292 100644 --- a/.github/workflows/android_test.yml +++ b/.github/workflows/android_test.yml @@ -18,7 +18,7 @@ jobs: TERM: dumb steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -50,14 +50,14 @@ jobs: - name: Upload logs if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: logs-${{ matrix.api-level }}-${{ matrix.shard }} path: logcat.txt - name: Upload test results if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: test-results-${{ matrix.api-level }}-${{ matrix.shard }} path: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 883b1c3abc..c8e33a7675 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: timeout-minutes: 40 steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -39,7 +39,7 @@ jobs: - name: test-results if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: build-results path: | @@ -55,7 +55,7 @@ jobs: timeout-minutes: 40 steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -76,7 +76,7 @@ jobs: - name: screenshot-test-results-1 if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: screenshot-results-1 path: | @@ -93,7 +93,7 @@ jobs: timeout-minutes: 40 steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -114,7 +114,7 @@ jobs: - name: screenshot-test-results-2 if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: screenshot-results-2 path: | @@ -134,7 +134,7 @@ jobs: TERM: dumb steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -160,7 +160,7 @@ jobs: timeout-minutes: 40 steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml index b54be58e15..3ecb2cd120 100644 --- a/.github/workflows/build_nightly.yml +++ b/.github/workflows/build_nightly.yml @@ -11,7 +11,7 @@ jobs: timeout-minutes: 40 steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -27,7 +27,7 @@ jobs: - name: Generate cache key run: ./checksum.sh checksum.txt - - uses: actions/cache@v4 + - uses: actions/cache@v5 with: path: | ~/.gradle/caches/modules-* @@ -47,7 +47,7 @@ jobs: - name: Upload test results and reports if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: build-results path: | @@ -56,7 +56,7 @@ jobs: - name: Upload apks if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: apks path: | diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml index 1a329cf54f..5b50895d77 100644 --- a/.github/workflows/fixup.yml +++ b/.github/workflows/fixup.yml @@ -9,7 +9,7 @@ jobs: timeout-minutes: 40 steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -28,7 +28,7 @@ jobs: arguments: --continue spotlessApply - name: Push reformatted code - uses: stefanzweifel/git-auto-commit-action@v6 + uses: stefanzweifel/git-auto-commit-action@v7 with: file_pattern: '**/*.kt' disable_globbing: true @@ -40,7 +40,7 @@ jobs: arguments: --continue metalavaGenerateSignature metalavaGenerateSignatureRelease - name: Push new apis - uses: stefanzweifel/git-auto-commit-action@v6 + uses: stefanzweifel/git-auto-commit-action@v7 with: file_pattern: '**/current.api' disable_globbing: true @@ -52,7 +52,7 @@ jobs: arguments: --continue verifyAndRecordRoborazziDebug - name: Push new screenshots if available - uses: stefanzweifel/git-auto-commit-action@v6 + uses: stefanzweifel/git-auto-commit-action@v7 if: ${{ always() }} with: file_pattern: '**/snapshots/images/*.png **/screenshots/*.png **/audit/*.png' diff --git a/.github/workflows/macrobenchmark.yml b/.github/workflows/macrobenchmark.yml index be20d50e00..bb8f971ff9 100644 --- a/.github/workflows/macrobenchmark.yml +++ b/.github/workflows/macrobenchmark.yml @@ -11,7 +11,7 @@ jobs: TERM: dumb steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -27,7 +27,7 @@ jobs: - name: Generate cache key run: ./checksum.sh checksum.txt - - uses: actions/cache@v4 + - uses: actions/cache@v5 with: path: | ~/.gradle/caches/modules-* @@ -47,14 +47,14 @@ jobs: - name: Upload logs if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: logs-${{ matrix.api-level }}-${{ matrix.shard }} path: logcat.txt - name: Upload test results if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: test-results-${{ matrix.api-level }}-${{ matrix.shard }} path: | diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 68fa4e77fc..479a34c9ef 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -13,7 +13,7 @@ jobs: TERM: dumb steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: lfs: 'true' @@ -29,7 +29,7 @@ jobs: - name: Generate cache key run: ./checksum.sh checksum.txt - - uses: actions/cache@v4 + - uses: actions/cache@v5 with: path: | ~/.gradle/caches/modules-* @@ -38,7 +38,7 @@ jobs: key: gradle-${{ hashFiles('checksum.txt') }} - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.x' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e380dfb521..dddceb6167 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,29 +2,29 @@ accessibilityTestFramework = "4.1.1" accompanist = "0.36.0" androidx-benchmark = "1.4.1" -androidx-complications-data = "1.3.0-alpha07" +androidx-complications-data = "1.3.0-rc01" androidx-concurrent = "1.3.0" androidx-constraintlayout-compose = "1.1.1" androidx-datastore = "1.2.0" androidx-graphics = "1.1.0" -androidx-health-services = "1.1.0-alpha05" +androidx-health-services = "1.1.0-beta01" androidx-hilt = "1.3.0" -androidx-media3 = "1.8.0" +androidx-media3 = "1.9.2" androidx-test-espresso = "3.7.0" androidx-test-ext = "1.3.0" androidx-test-runner = "1.7.0" -androidx-wear-watchface = "1.3.0-alpha07" -androidxActivity = "1.12.1" +androidx-wear-watchface = "1.3.0-rc01" +androidxActivity = "1.12.4" androidxComposeBom = "2025.12.00" androidxCore = "1.17.0" androidxLifecycle = "2.10.0" -androidxNavigation = "2.9.6" +androidxNavigation = "2.9.7" androidxPhoneInteractions = "1.1.0" androidxRemoteInteractions = "1.1.0" androidxStartup = "1.2.0" androidxTracing = "1.3.0" -androidxWear = "1.4.0-alpha02" -androidxWork = "2.11.0" +androidxWear = "1.4.0-rc01" +androidxWork = "2.11.1" androidxprotolayout = "1.3.0" androidxtiles = "1.5.0" annotation = "1.0.1" @@ -34,12 +34,12 @@ com-squareup-okhttp3 = "5.3.2" com-squareup-retrofit2 = "3.0.0" compose-material3 = "1.4.0" composesnapshot = "-" -dependencyAnalysis = "2.19.0" +dependencyAnalysis = "3.5.1" desugar_jdk_libs = "2.1.5" -dokka = "2.0.0" -googledagger = "2.57.2" -gradlePublishPlugin = "0.34.0" -grpcStub = "1.73.0" +dokka = "2.1.0" +googledagger = "2.59.2" +gradlePublishPlugin = "0.36.0" +grpcStub = "1.79.0" io-coil-kt = "2.7.0" junit = "4.13.2" kotlin = "2.2.21" @@ -48,29 +48,29 @@ kotlinxSerialization = "1.9.0" ksp = "2.2.10-2.0.2" ktlint = "0.50.0" material = "1.13.0" -metalava = "0.4.0-alpha03" +metalava = "0.5.0" moshi = "1.15.2" okio = "3.16.4" -org-robolectric = "4.16" -ossLicensesPlugin = "0.10.9" -osslicenses = "0.9.0" -playServicesAuth = "21.4.0" -playServicesOssLicenses = "17.3.0" +org-robolectric = "4.16.1" +ossLicensesPlugin = "0.10.10" +osslicenses = "0.10.0" +playServicesAuth = "21.5.1" +playServicesOssLicenses = "17.4.0" # Stay on 4.26.1 due to https://github.com/firebase/firebase-android-sdk/issues/5997 protobuf = "4.26.1" -protobuf-gen-grpc-java = "1.73.0" +protobuf-gen-grpc-java = "1.79.0" protobuf-gen-grpc-kotlin = "1.4.3:jdk8@jar" protobuf-gen-javalite = "3.0.0" -roborazzi = "1.52.0" +roborazzi = "1.59.0" room = "2.8.4" -runtimeTracing = "1.10.0" -spotless = "7.2.1" +runtimeTracing = "1.10.3" +spotless = "8.2.1" tiles-tooling-preview = "1.5.0" truth = "1.4.5" wearInput = "1.2.0" wearToolingPreview = "1.0.0" -wearcompose = "1.6.0-alpha06" -agp = "8.12.3" +wearcompose = "1.6.0-alpha10" +agp = "9.0.1" [libraries] accessibility-test-framework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version.ref = "accessibilityTestFramework" } @@ -121,7 +121,7 @@ androidx-metrics-performance = "androidx.metrics:metrics-performance:1.0.0" androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" } androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" } androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigation" } -androidx-paging = "androidx.paging:paging-compose:3.3.6" +androidx-paging = "androidx.paging:paging-compose:3.4.1" androidx-palette-ktx = "androidx.palette:palette-ktx:1.0.0" androidx-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "runtimeTracing" } androidx-startup = { module = "androidx.startup:startup-runtime", version.ref = "androidxStartup" } @@ -179,16 +179,16 @@ dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plu dagger-hiltandroidtesting = { module = "com.google.dagger:hilt-android-testing", version.ref = "googledagger" } desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" } dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } -google-genai = "com.google.genai:google-genai:1.30.0" +google-genai = "com.google.genai:google-genai:1.40.0" gradleMavenPublishPlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradlePublishPlugin" } grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpcStub" } hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" } hilt-ext-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" } hilt-navigationcompose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" } -io-grpc-grpc-android = "io.grpc:grpc-android:1.73.0" -io-grpc-grpc-binder = "io.grpc:grpc-binder:1.73.0" -io-grpc-grpc-kotlin = "io.grpc:grpc-kotlin-stub:1.4.3" -io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.73.0" +io-grpc-grpc-android = "io.grpc:grpc-android:1.79.0" +io-grpc-grpc-binder = "io.grpc:grpc-binder:1.79.0" +io-grpc-grpc-kotlin = "io.grpc:grpc-kotlin-stub:1.5.0" +io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.79.0" junit = { module = "junit:junit", version.ref = "junit" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } @@ -211,7 +211,7 @@ oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", v osslicenses-wear-compose-material = { module = "io.github.droibit.oss-licenses-android:ui-wear-compose-material", version.ref = "osslicenses" } play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" } playservices-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServicesAuth" } -playservices-base = "com.google.android.gms:play-services-base:18.9.0" +playservices-base = "com.google.android.gms:play-services-base:18.10.0" playservices-wearable = "com.google.android.gms:play-services-wearable:19.0.0" protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" } protobuf-protoc-gen-grpc-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "protobuf-gen-grpc-java"} @@ -246,6 +246,6 @@ kotlinGradle = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } metalavaGradle = { id = "me.tylerbwong.gradle.metalava", version.ref = "metalava" } -protobuf = "com.google.protobuf:0.9.5" +protobuf = "com.google.protobuf:0.9.6" roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7705927e94..5f38436fc6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 34bee3e888..f3fb39e10a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("com.gradle.develocity") version "4.1.1" + id("com.gradle.develocity") version "4.3.2" } develocity {