Skip to content

Revert to AGP 8.7.3#21917

Closed
nbradbury wants to merge 5 commits into
trunkfrom
issue/CMM-401-wrong-locale
Closed

Revert to AGP 8.7.3#21917
nbradbury wants to merge 5 commits into
trunkfrom
issue/CMM-401-wrong-locale

Conversation

@nbradbury

@nbradbury nbradbury commented May 28, 2025

Copy link
Copy Markdown
Contributor

Fixes CMM-401

As discussed on the Google Issue Tracker, updating to AGP 8.8 causes the per-app language preference to be lost. If you change the per-app language setting it is briefly retained, but quickly reverts back to the device's default language.

This was not resolved in either AGP 8.9 or 8.10, so the only option was to revert back to 8.7.3.

To test:

  • Change the app language and verify that it's retained
  • Smoke test the app with GBK enabled and verify that it works as expected

Related Slack discussion: p1748343842443099-slack-C04HB8JU78A

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR reverts the Android Gradle Plugin (AGP) version to 8.7.3 to address CMM-401.

  • Downgrades AGP from 8.8.1 back to 8.7.3 as a temporary fix for build issues.

@dangermattic

dangermattic commented May 28, 2025

Copy link
Copy Markdown
Collaborator
1 Warning
⚠️ PR is not assigned to a milestone.

Generated by 🚫 Danger

@wpmobilebot

wpmobilebot commented May 28, 2025

Copy link
Copy Markdown
Contributor

Project dependencies changes

list
! Upgraded Dependencies
androidx.databinding:viewbinding:8.7.3, (changed from 8.8.1)
tree
-+--- androidx.databinding:viewbinding:8.8.1
++--- androidx.databinding:viewbinding:8.7.3
 \--- project :libs:image-editor
-     \--- androidx.databinding:viewbinding:8.8.1 (*)
+     \--- androidx.databinding:viewbinding:8.7.3 (*)

Build environment changes

list
! Upgraded Dependencies
androidx.databinding:databinding-common:8.7.3, (changed from 8.8.1)
androidx.databinding:databinding-compiler-common:8.7.3, (changed from 8.8.1)
com.android.application:com.android.application.gradle.plugin:8.7.3, (changed from 8.8.1)
com.android.databinding:baseLibrary:8.7.3, (changed from 8.8.1)
com.android.library:com.android.library.gradle.plugin:8.7.3, (changed from 8.8.1)
com.android.tools.analytics-library:crash:31.7.3, (changed from 31.8.1)
com.android.tools.analytics-library:protos:31.7.3, (changed from 31.8.1)
com.android.tools.analytics-library:shared:31.7.3, (changed from 31.8.1)
com.android.tools.analytics-library:tracker:31.7.3, (changed from 31.8.1)
com.android.tools.build:aapt2-proto:8.7.3-12006047, (changed from 8.8.1-12006047)
com.android.tools.build:aaptcompiler:8.7.3, (changed from 8.8.1)
com.android.tools.build:apksig:8.7.3, (changed from 8.8.1)
com.android.tools.build:apkzlib:8.7.3, (changed from 8.8.1)
com.android.tools.build:builder:8.7.3, (changed from 8.8.1)
com.android.tools.build:builder-model:8.7.3, (changed from 8.8.1)
com.android.tools.build:builder-test-api:8.7.3, (changed from 8.8.1)
com.android.tools.build:bundletool:1.17.1, (changed from 1.17.2)
com.android.tools.build:gradle:8.7.3, (changed from 8.8.1)
com.android.tools.build:gradle-api:8.7.3, (changed from 8.8.1)
com.android.tools.build:gradle-settings-api:8.7.3, (changed from 8.8.1)
com.android.tools.build:manifest-merger:31.7.3, (changed from 31.8.1)
com.android.tools.ddms:ddmlib:31.7.3, (changed from 31.8.1)
com.android.tools.layoutlib:layoutlib-api:31.7.3, (changed from 31.8.1)
com.android.tools.lint:lint-model:31.7.3, (changed from 31.8.1)
com.android.tools.lint:lint-typedef-remover:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-device-provider-ddmlib-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-device-provider-gradle-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-device-provider-profile-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-test-plugin-host-coverage-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-test-plugin-host-logcat-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.3, (changed from 31.8.1)
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.7.3, (changed from 31.8.1)
com.android.tools:annotations:31.7.3, (changed from 31.8.1)
com.android.tools:common:31.7.3, (changed from 31.8.1)
com.android.tools:dvlib:31.7.3, (changed from 31.8.1)
com.android.tools:repository:31.7.3, (changed from 31.8.1)
com.android.tools:sdk-common:31.7.3, (changed from 31.8.1)
com.android.tools:sdklib:31.7.3, (changed from 31.8.1)
com.android:signflinger:8.7.3, (changed from 8.8.1)
com.android:zipflinger:8.7.3, (changed from 8.8.1)
org.ow2.asm:asm:9.6, (changed from 9.7)
org.ow2.asm:asm-analysis:9.6, (changed from 9.7)
org.ow2.asm:asm-commons:9.6, (changed from 9.7)
org.ow2.asm:asm-tree:9.6, (changed from 9.7)
org.ow2.asm:asm-util:9.6, (changed from 9.7)
tree
-+--- com.android.application:com.android.application.gradle.plugin:8.8.1
-|    \--- com.android.tools.build:gradle:8.8.1
-|         +--- com.android.tools.build:gradle-settings-api:8.8.1
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         +--- com.android.tools:sdk-common:31.8.1
-|         |    +--- com.android.tools.analytics-library:shared:31.8.1
-|         |    |    +--- com.android.tools.analytics-library:protos:31.8.1
-|         |    |    |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         |    |    +--- com.android.tools:annotations:31.8.1
-|         |    |    +--- com.android.tools:common:31.8.1
-|         |    |    |    +--- com.android.tools:annotations:31.8.1
-|         |    |    |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    |    |    +--- net.java.dev.jna:jna-platform:5.6.0
-|         |    |    |    |    \--- net.java.dev.jna:jna:5.6.0
-|         |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    |    +--- com.google.code.gson:gson:2.10.1
-|         |    |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    |    +--- net.java.dev.jna:jna-platform:5.6.0 (*)
-|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    +--- com.android.tools.build:aapt2-proto:8.8.1-12006047
-|         |    |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         |    +--- com.android.tools:common:31.8.1 (*)
-|         |    +--- com.android.tools.ddms:ddmlib:31.8.1
-|         |    |    +--- com.android.tools:common:31.8.1 (*)
-|         |    |    +--- com.google.protobuf:protobuf-java:3.22.3
-|         |    |    +--- net.sf.kxml:kxml2:2.3.0
-|         |    |    \--- org.jetbrains:annotations:23.0.0
-|         |    +--- com.android.tools.layoutlib:layoutlib-api:31.8.1
-|         |    |    +--- com.android.tools:annotations:31.8.1
-|         |    |    +--- com.android.tools:common:31.8.1 (*)
-|         |    |    +--- net.sf.kxml:kxml2:2.3.0
-|         |    |    \--- org.jetbrains:annotations:23.0.0
-|         |    +--- com.android.tools:sdklib:31.8.1
-|         |    |    +--- com.android.tools:repository:31.8.1
-|         |    |    |    +--- com.android.tools.analytics-library:shared:31.8.1 (*)
-|         |    |    |    +--- com.android.tools:common:31.8.1 (*)
-|         |    |    |    +--- com.google.jimfs:jimfs:1.1
-|         |    |    |    |    \--- com.google.guava:guava:18.0 -> 33.3.1-jre (*)
-|         |    |    |    +--- com.sun.activation:javax.activation:1.2.0
-|         |    |    |    +--- org.apache.commons:commons-compress:1.21
-|         |    |    |    +--- org.glassfish.jaxb:jaxb-runtime:2.3.2
-|         |    |    |    |    +--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
-|         |    |    |    |    |    \--- jakarta.activation:jakarta.activation-api:1.2.1
-|         |    |    |    |    +--- org.glassfish.jaxb:txw2:2.3.2
-|         |    |    |    |    +--- com.sun.istack:istack-commons-runtime:3.0.8
-|         |    |    |    |    |    \--- jakarta.activation:jakarta.activation-api:1.2.1
-|         |    |    |    |    +--- org.jvnet.staxex:stax-ex:1.8.1
-|         |    |    |    |    |    +--- jakarta.activation:jakarta.activation-api:1.2.1
-|         |    |    |    |    |    \--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 (*)
-|         |    |    |    |    +--- com.sun.xml.fastinfoset:FastInfoset:1.2.16
-|         |    |    |    |    \--- jakarta.activation:jakarta.activation-api:1.2.1
-|         |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    |    +--- com.android.tools:common:31.8.1 (*)
-|         |    |    +--- com.android.tools:dvlib:31.8.1
-|         |    |    |    \--- com.android.tools:common:31.8.1 (*)
-|         |    |    +--- com.android.tools.layoutlib:layoutlib-api:31.8.1 (*)
-|         |    |    +--- com.google.code.gson:gson:2.10.1
-|         |    |    +--- org.apache.commons:commons-compress:1.21
-|         |    |    +--- org.apache.httpcomponents:httpcore:4.4.16
-|         |    |    +--- org.apache.httpcomponents:httpmime:4.5.6
-|         |    |    |    \--- org.apache.httpcomponents:httpclient:4.5.6 -> 4.5.14
-|         |    |    |         +--- org.apache.httpcomponents:httpcore:4.4.16
-|         |    |    |         +--- commons-logging:commons-logging:1.2
-|         |    |    |         \--- commons-codec:commons-codec:1.11
-|         |    |    \--- org.glassfish.jaxb:jaxb-runtime:2.3.2 (*)
-|         |    +--- com.google.code.gson:gson:2.10.1
-|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    +--- com.google.protobuf:protobuf-java:3.22.3
-|         |    +--- javax.inject:javax.inject:1
-|         |    +--- net.sf.kxml:kxml2:2.3.0
-|         |    +--- org.bouncycastle:bcpkix-jdk18on:1.77
-|         |    |    +--- org.bouncycastle:bcprov-jdk18on:1.77
-|         |    |    \--- org.bouncycastle:bcutil-jdk18on:1.77
-|         |    |         \--- org.bouncycastle:bcprov-jdk18on:1.77
-|         |    +--- org.bouncycastle:bcprov-jdk18on:1.77
-|         |    +--- org.glassfish.jaxb:jaxb-runtime:2.3.2 (*)
-|         |    +--- org.jetbrains.kotlin:kotlin-reflect:2.0.21 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         +--- com.android.tools:sdklib:31.8.1 (*)
-|         +--- com.android.tools:repository:31.8.1 (*)
-|         +--- com.android.tools.ddms:ddmlib:31.8.1 (*)
-|         +--- com.android.tools.build:aapt2-proto:8.8.1-12006047 (*)
-|         +--- com.android.tools.build:aaptcompiler:8.8.1
-|         |    +--- com.android.tools.build:aapt2-proto:8.8.1-12006047 (*)
-|         |    +--- com.android.tools.layoutlib:layoutlib-api:31.8.1 (*)
-|         |    +--- com.android.tools:common:31.8.1 (*)
-|         |    +--- com.google.protobuf:protobuf-java:3.22.3
-|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         +--- com.android.tools.analytics-library:crash:31.8.1
-|         |    +--- com.android.tools:annotations:31.8.1
-|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    +--- org.apache.httpcomponents:httpclient:4.5.14 (*)
-|         |    +--- org.apache.httpcomponents:httpcore:4.4.16
-|         |    \--- org.apache.httpcomponents:httpmime:4.5.6 (*)
-|         +--- com.android.tools.analytics-library:shared:31.8.1 (*)
-|         +--- com.android.tools.lint:lint-model:31.8.1
-|         |    +--- com.android.tools.build:builder-model:8.8.1
-|         |    |    +--- com.android.tools:annotations:31.8.1
-|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    +--- com.android.tools:common:31.8.1 (*)
-|         |    +--- com.android.tools:sdk-common:31.8.1 (*)
-|         |    +--- net.sf.kxml:kxml2:2.3.0
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         +--- com.android.tools.lint:lint-typedef-remover:31.8.1
-|         |    +--- com.android.tools:annotations:31.8.1
-|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    \--- org.ow2.asm:asm:9.7
-|         +--- androidx.databinding:databinding-compiler-common:8.8.1
-|         |    +--- androidx.databinding:databinding-common:8.8.1
-|         |    +--- com.android.databinding:baseLibrary:8.8.1
-|         |    +--- com.android.tools:annotations:31.8.1
-|         |    +--- com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10
-|         |    |    +--- com.google.code.gson:gson:2.8.0 -> 2.10.1
-|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 2.1.10 (*)
-|         |    +--- com.google.code.gson:gson:2.10.1
-|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    +--- com.googlecode.juniversalchardet:juniversalchardet:1.0.3
-|         |    +--- com.squareup:javapoet:1.10.0 -> 1.13.0
-|         |    +--- commons-io:commons-io:2.13.0
-|         |    +--- org.glassfish.jaxb:jaxb-runtime:2.3.2 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         +--- androidx.databinding:databinding-common:8.8.1
-|         +--- com.android.databinding:baseLibrary:8.8.1
-|         +--- com.android.tools.build:builder-test-api:8.8.1
-|         |    +--- com.android.tools.ddms:ddmlib:31.8.1 (*)
-|         |    +--- com.android.tools:annotations:31.8.1
-|         |    +--- com.android.tools:common:31.8.1 (*)
-|         |    \--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         +--- com.android.tools.layoutlib:layoutlib-api:31.8.1 (*)
-|         +--- com.android.tools.utp:android-device-provider-ddmlib-proto:31.8.1
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-device-provider-gradle-proto:31.8.1
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-device-provider-profile-proto:31.8.1
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.8.1
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-test-plugin-host-coverage-proto:31.8.1
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.8.1
-|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-test-plugin-host-logcat-proto:31.8.1
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.8.1
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-test-plugin-host-retention-proto:31.8.1
-|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.8.1
-|         |    +--- com.google.code.gson:gson:2.10.1
-|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    +--- io.grpc:grpc-core:1.57.0
-|         |    |    +--- io.grpc:grpc-api:1.57.0
-|         |    |    |    +--- com.google.code.findbugs:jsr305:3.0.2
-|         |    |    |    +--- com.google.errorprone:error_prone_annotations:2.18.0 -> 2.28.0
-|         |    |    |    \--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
-|         |    |    +--- com.google.code.gson:gson:2.10.1
-|         |    |    +--- com.google.android:annotations:4.1.1.4
-|         |    |    +--- org.codehaus.mojo:animal-sniffer-annotations:1.23
-|         |    |    +--- com.google.errorprone:error_prone_annotations:2.18.0 -> 2.28.0
-|         |    |    +--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
-|         |    |    +--- io.perfmark:perfmark-api:0.26.0
-|         |    |    \--- io.grpc:grpc-context:1.57.0
-|         |    |         \--- io.grpc:grpc-api:1.57.0 (*)
-|         |    +--- io.grpc:grpc-netty:1.57.0
-|         |    |    +--- io.grpc:grpc-core:1.57.0 (*)
-|         |    |    +--- io.netty:netty-codec-http2:4.1.93.Final
-|         |    |    |    +--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    +--- io.netty:netty-buffer:4.1.93.Final
-|         |    |    |    |    \--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    +--- io.netty:netty-transport:4.1.93.Final
-|         |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
-|         |    |    |    |    \--- io.netty:netty-resolver:4.1.93.Final
-|         |    |    |    |         \--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    +--- io.netty:netty-codec:4.1.93.Final
-|         |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
-|         |    |    |    |    \--- io.netty:netty-transport:4.1.93.Final (*)
-|         |    |    |    +--- io.netty:netty-handler:4.1.93.Final
-|         |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    |    +--- io.netty:netty-resolver:4.1.93.Final (*)
-|         |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
-|         |    |    |    |    +--- io.netty:netty-transport:4.1.93.Final (*)
-|         |    |    |    |    +--- io.netty:netty-transport-native-unix-common:4.1.93.Final
-|         |    |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
-|         |    |    |    |    |    \--- io.netty:netty-transport:4.1.93.Final (*)
-|         |    |    |    |    \--- io.netty:netty-codec:4.1.93.Final (*)
-|         |    |    |    \--- io.netty:netty-codec-http:4.1.93.Final
-|         |    |    |         +--- io.netty:netty-common:4.1.93.Final
-|         |    |    |         +--- io.netty:netty-buffer:4.1.93.Final (*)
-|         |    |    |         +--- io.netty:netty-transport:4.1.93.Final (*)
-|         |    |    |         +--- io.netty:netty-codec:4.1.93.Final (*)
-|         |    |    |         \--- io.netty:netty-handler:4.1.93.Final (*)
-|         |    |    +--- io.netty:netty-handler-proxy:4.1.93.Final
-|         |    |    |    +--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
-|         |    |    |    +--- io.netty:netty-transport:4.1.93.Final (*)
-|         |    |    |    +--- io.netty:netty-codec:4.1.93.Final (*)
-|         |    |    |    +--- io.netty:netty-codec-socks:4.1.93.Final
-|         |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
-|         |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
-|         |    |    |    |    +--- io.netty:netty-transport:4.1.93.Final (*)
-|         |    |    |    |    \--- io.netty:netty-codec:4.1.93.Final (*)
-|         |    |    |    \--- io.netty:netty-codec-http:4.1.93.Final (*)
-|         |    |    +--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
-|         |    |    +--- com.google.errorprone:error_prone_annotations:2.18.0 -> 2.28.0
-|         |    |    +--- io.perfmark:perfmark-api:0.26.0
-|         |    |    \--- io.netty:netty-transport-native-unix-common:4.1.93.Final (*)
-|         |    +--- io.grpc:grpc-protobuf:1.57.0
-|         |    |    +--- io.grpc:grpc-api:1.57.0 (*)
-|         |    |    +--- com.google.code.findbugs:jsr305:3.0.2
-|         |    |    +--- com.google.protobuf:protobuf-java:3.22.3
-|         |    |    +--- com.google.api.grpc:proto-google-common-protos:2.17.0
-|         |    |    |    \--- com.google.protobuf:protobuf-java:3.21.12 -> 3.22.3
-|         |    |    +--- io.grpc:grpc-protobuf-lite:1.57.0
-|         |    |    |    +--- io.grpc:grpc-api:1.57.0 (*)
-|         |    |    |    +--- com.google.code.findbugs:jsr305:3.0.2
-|         |    |    |    \--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
-|         |    |    \--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
-|         |    +--- io.grpc:grpc-stub:1.57.0
-|         |    |    +--- io.grpc:grpc-api:1.57.0 (*)
-|         |    |    +--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
-|         |    |    \--- com.google.errorprone:error_prone_annotations:2.18.0 -> 2.28.0
-|         |    +--- javax.annotation:javax.annotation-api:1.3.2
-|         |    \--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         +--- com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
-|         +--- org.apache.httpcomponents:httpmime:4.5.6 (*)
-|         +--- commons-io:commons-io:2.13.0
-|         +--- org.ow2.asm:asm:9.7
-|         +--- org.ow2.asm:asm-analysis:9.7
-|         |    \--- org.ow2.asm:asm-tree:9.7
-|         |         \--- org.ow2.asm:asm:9.7
-|         +--- org.ow2.asm:asm-commons:9.7
-|         |    +--- org.ow2.asm:asm:9.7
-|         |    \--- org.ow2.asm:asm-tree:9.7 (*)
-|         +--- org.ow2.asm:asm-util:9.7
-|         |    +--- org.ow2.asm:asm:9.7
-|         |    +--- org.ow2.asm:asm-tree:9.7 (*)
-|         |    \--- org.ow2.asm:asm-analysis:9.7 (*)
-|         +--- org.bouncycastle:bcpkix-jdk18on:1.77 (*)
-|         +--- org.glassfish.jaxb:jaxb-runtime:2.3.2 (*)
-|         +--- net.sf.jopt-simple:jopt-simple:4.9
-|         +--- com.android.tools.build:bundletool:1.17.2
-|         |    +--- com.android.tools.build:aapt2-proto:7.3.0-alpha07-8248216 -> 8.8.1-12006047 (*)
-|         |    +--- com.google.auto.value:auto-value-annotations:1.6.2
-|         |    +--- com.google.errorprone:error_prone_annotations:2.3.1 -> 2.28.0
-|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    +--- com.google.protobuf:protobuf-java:3.22.3
-|         |    +--- com.google.protobuf:protobuf-java-util:3.22.3
-|         |    |    +--- com.google.protobuf:protobuf-java:3.22.3
-|         |    |    +--- com.google.code.findbugs:jsr305:3.0.2
-|         |    |    +--- com.google.code.gson:gson:2.8.9 -> 2.10.1
-|         |    |    +--- com.google.errorprone:error_prone_annotations:2.11.0 -> 2.28.0
-|         |    |    +--- com.google.guava:guava:31.1-jre -> 33.3.1-jre (*)
-|         |    |    \--- com.google.j2objc:j2objc-annotations:1.3 -> 3.0.0
-|         |    +--- com.google.dagger:dagger:2.28.3
-|         |    |    \--- javax.inject:javax.inject:1
-|         |    +--- javax.inject:javax.inject:1
-|         |    +--- org.bitbucket.b_c:jose4j:0.9.5
-|         |    \--- org.slf4j:slf4j-api:1.7.30 -> 2.0.16
-|         +--- com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10 (*)
-|         +--- com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
-|         |    +--- com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10 (*)
-|         |    +--- org.ow2.asm:asm:8.0.1 -> 9.7
-|         |    +--- org.ow2.asm:asm-util:8.0.1 -> 9.7 (*)
-|         |    +--- org.ow2.asm:asm-commons:8.0.1 -> 9.7 (*)
-|         |    +--- org.jdom:jdom2:2.0.6
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 2.1.10 (*)
-|         +--- com.squareup:javapoet:1.10.0 -> 1.13.0
-|         +--- com.google.protobuf:protobuf-java:3.22.3
-|         +--- com.google.protobuf:protobuf-java-util:3.22.3 (*)
-|         +--- com.google.code.gson:gson:2.10.1
-|         +--- io.grpc:grpc-core:1.57.0 (*)
-|         +--- io.grpc:grpc-netty:1.57.0 (*)
-|         +--- io.grpc:grpc-protobuf:1.57.0 (*)
-|         +--- io.grpc:grpc-stub:1.57.0 (*)
-|         +--- com.google.crypto.tink:tink:1.7.0
-|         |    +--- com.google.protobuf:protobuf-java:3.19.3 -> 3.22.3
-|         |    \--- com.google.code.gson:gson:2.8.9 -> 2.10.1
-|         +--- com.google.testing.platform:core-proto:0.0.9-alpha02
-|         +--- com.google.flatbuffers:flatbuffers-java:1.12.0
-|         +--- org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
-|         |    +--- org.checkerframework:checker-qual:2.5.8 -> 3.43.0
-|         |    \--- com.google.flatbuffers:flatbuffers-java:1.12.0
-|         +--- com.android.tools.build:builder:8.8.1
-|         |    +--- com.android.tools.build:builder-model:8.8.1 (*)
-|         |    +--- com.android.tools.build:builder-test-api:8.8.1 (*)
-|         |    +--- com.android.tools:sdklib:31.8.1 (*)
-|         |    +--- com.android.tools:sdk-common:31.8.1 (*)
-|         |    +--- com.android.tools:common:31.8.1 (*)
-|         |    +--- com.android.tools.ddms:ddmlib:31.8.1 (*)
-|         |    +--- com.android:signflinger:8.8.1
-|         |    |    +--- com.android.tools:annotations:31.8.1
-|         |    |    +--- com.android.tools.build:apksig:8.8.1
-|         |    |    \--- com.android:zipflinger:8.8.1
-|         |    |         \--- com.android.tools:annotations:31.8.1
-|         |    +--- com.android.tools.analytics-library:protos:31.8.1 (*)
-|         |    +--- com.android.tools.analytics-library:tracker:31.8.1
-|         |    |    +--- com.android.tools.analytics-library:protos:31.8.1 (*)
-|         |    |    +--- com.android.tools.analytics-library:shared:31.8.1 (*)
-|         |    |    +--- com.android.tools:annotations:31.8.1
-|         |    |    +--- com.android.tools:common:31.8.1 (*)
-|         |    |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    |    +--- com.google.protobuf:protobuf-java:3.22.3
-|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    +--- com.android.tools.layoutlib:layoutlib-api:31.8.1 (*)
-|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    +--- org.bouncycastle:bcpkix-jdk18on:1.77 (*)
-|         |    +--- commons-codec:commons-codec:1.10 -> 1.11
-|         |    +--- org.bouncycastle:bcprov-jdk18on:1.77
-|         |    +--- javax.inject:javax.inject:1
-|         |    +--- org.ow2.asm:asm-commons:9.7 (*)
-|         |    +--- com.android.tools.build:manifest-merger:31.8.1
-|         |    |    +--- com.android.tools:common:31.8.1 (*)
-|         |    |    +--- com.android.tools:sdklib:31.8.1 (*)
-|         |    |    +--- com.android.tools:sdk-common:31.8.1 (*)
-|         |    |    +--- com.google.code.gson:gson:2.10.1
-|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|         |    +--- com.android:zipflinger:8.8.1 (*)
-|         |    +--- com.android.tools.build:apksig:8.8.1
-|         |    +--- com.android.tools.build:apkzlib:8.8.1
-|         |    |    +--- com.android.tools.build:apksig:8.8.1
-|         |    |    +--- com.google.code.findbugs:jsr305:3.0.2
-|         |    |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|         |    |    +--- org.bouncycastle:bcpkix-jdk18on:1.77 (*)
-|         |    |    \--- org.bouncycastle:bcprov-jdk18on:1.77
-|         |    \--- com.squareup:javawriter:2.5.0
-|         +--- com.android.tools.build:builder-model:8.8.1 (*)
-|         \--- com.android.tools.build:gradle-api:8.8.1
-|              +--- com.android.tools.build:builder-test-api:8.8.1 (*)
-|              +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
-|              +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 (*)
-|              \--- org.ow2.asm:asm:9.7
++--- com.android.application:com.android.application.gradle.plugin:8.7.3
+|    \--- com.android.tools.build:gradle:8.7.3
+|         +--- com.android.tools.build:gradle-settings-api:8.7.3
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         +--- com.android.tools:sdk-common:31.7.3
+|         |    +--- com.android.tools.analytics-library:shared:31.7.3
+|         |    |    +--- com.android.tools.analytics-library:protos:31.7.3
+|         |    |    |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         |    |    +--- com.android.tools:annotations:31.7.3
+|         |    |    +--- com.android.tools:common:31.7.3
+|         |    |    |    +--- com.android.tools:annotations:31.7.3
+|         |    |    |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    |    |    +--- net.java.dev.jna:jna-platform:5.6.0
+|         |    |    |    |    \--- net.java.dev.jna:jna:5.6.0
+|         |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    |    +--- com.google.code.gson:gson:2.10.1
+|         |    |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    |    +--- net.java.dev.jna:jna-platform:5.6.0 (*)
+|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    +--- com.android.tools.build:aapt2-proto:8.7.3-12006047
+|         |    |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         |    +--- com.android.tools:common:31.7.3 (*)
+|         |    +--- com.android.tools.ddms:ddmlib:31.7.3
+|         |    |    +--- com.android.tools:common:31.7.3 (*)
+|         |    |    +--- com.google.protobuf:protobuf-java:3.22.3
+|         |    |    +--- net.sf.kxml:kxml2:2.3.0
+|         |    |    \--- org.jetbrains:annotations:23.0.0
+|         |    +--- com.android.tools.layoutlib:layoutlib-api:31.7.3
+|         |    |    +--- com.android.tools:annotations:31.7.3
+|         |    |    +--- com.android.tools:common:31.7.3 (*)
+|         |    |    +--- net.sf.kxml:kxml2:2.3.0
+|         |    |    \--- org.jetbrains:annotations:23.0.0
+|         |    +--- com.android.tools:sdklib:31.7.3
+|         |    |    +--- com.android.tools:repository:31.7.3
+|         |    |    |    +--- com.android.tools.analytics-library:shared:31.7.3 (*)
+|         |    |    |    +--- com.android.tools:common:31.7.3 (*)
+|         |    |    |    +--- com.google.jimfs:jimfs:1.1
+|         |    |    |    |    \--- com.google.guava:guava:18.0 -> 33.3.1-jre (*)
+|         |    |    |    +--- com.sun.activation:javax.activation:1.2.0
+|         |    |    |    +--- org.apache.commons:commons-compress:1.21
+|         |    |    |    +--- org.glassfish.jaxb:jaxb-runtime:2.3.2
+|         |    |    |    |    +--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
+|         |    |    |    |    |    \--- jakarta.activation:jakarta.activation-api:1.2.1
+|         |    |    |    |    +--- org.glassfish.jaxb:txw2:2.3.2
+|         |    |    |    |    +--- com.sun.istack:istack-commons-runtime:3.0.8
+|         |    |    |    |    |    \--- jakarta.activation:jakarta.activation-api:1.2.1
+|         |    |    |    |    +--- org.jvnet.staxex:stax-ex:1.8.1
+|         |    |    |    |    |    +--- jakarta.activation:jakarta.activation-api:1.2.1
+|         |    |    |    |    |    \--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 (*)
+|         |    |    |    |    +--- com.sun.xml.fastinfoset:FastInfoset:1.2.16
+|         |    |    |    |    \--- jakarta.activation:jakarta.activation-api:1.2.1
+|         |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    |    +--- com.android.tools:common:31.7.3 (*)
+|         |    |    +--- com.android.tools:dvlib:31.7.3
+|         |    |    |    \--- com.android.tools:common:31.7.3 (*)
+|         |    |    +--- com.android.tools.layoutlib:layoutlib-api:31.7.3 (*)
+|         |    |    +--- com.google.code.gson:gson:2.10.1
+|         |    |    +--- org.apache.commons:commons-compress:1.21
+|         |    |    +--- org.apache.httpcomponents:httpcore:4.4.16
+|         |    |    +--- org.apache.httpcomponents:httpmime:4.5.6
+|         |    |    |    \--- org.apache.httpcomponents:httpclient:4.5.6 -> 4.5.14
+|         |    |    |         +--- org.apache.httpcomponents:httpcore:4.4.16
+|         |    |    |         +--- commons-logging:commons-logging:1.2
+|         |    |    |         \--- commons-codec:commons-codec:1.11
+|         |    |    \--- org.glassfish.jaxb:jaxb-runtime:2.3.2 (*)
+|         |    +--- com.google.code.gson:gson:2.10.1
+|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    +--- com.google.protobuf:protobuf-java:3.22.3
+|         |    +--- javax.inject:javax.inject:1
+|         |    +--- net.sf.kxml:kxml2:2.3.0
+|         |    +--- org.bouncycastle:bcpkix-jdk18on:1.77
+|         |    |    +--- org.bouncycastle:bcprov-jdk18on:1.77
+|         |    |    \--- org.bouncycastle:bcutil-jdk18on:1.77
+|         |    |         \--- org.bouncycastle:bcprov-jdk18on:1.77
+|         |    +--- org.bouncycastle:bcprov-jdk18on:1.77
+|         |    +--- org.glassfish.jaxb:jaxb-runtime:2.3.2 (*)
+|         |    +--- org.jetbrains.intellij.deps:trove4j:1.0.20200330
+|         |    +--- org.jetbrains.kotlin:kotlin-reflect:1.9.20 -> 2.0.21 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         +--- com.android.tools:sdklib:31.7.3 (*)
+|         +--- com.android.tools:repository:31.7.3 (*)
+|         +--- com.android.tools.ddms:ddmlib:31.7.3 (*)
+|         +--- com.android.tools.build:aapt2-proto:8.7.3-12006047 (*)
+|         +--- com.android.tools.build:aaptcompiler:8.7.3
+|         |    +--- com.android.tools.build:aapt2-proto:8.7.3-12006047 (*)
+|         |    +--- com.android.tools.layoutlib:layoutlib-api:31.7.3 (*)
+|         |    +--- com.android.tools:common:31.7.3 (*)
+|         |    +--- com.google.protobuf:protobuf-java:3.22.3
+|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         +--- com.android.tools.analytics-library:crash:31.7.3
+|         |    +--- com.android.tools:annotations:31.7.3
+|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    +--- org.apache.httpcomponents:httpclient:4.5.14 (*)
+|         |    +--- org.apache.httpcomponents:httpcore:4.4.16
+|         |    \--- org.apache.httpcomponents:httpmime:4.5.6 (*)
+|         +--- com.android.tools.analytics-library:shared:31.7.3 (*)
+|         +--- com.android.tools.lint:lint-model:31.7.3
+|         |    +--- com.android.tools.build:builder-model:8.7.3
+|         |    |    +--- com.android.tools:annotations:31.7.3
+|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    +--- com.android.tools:common:31.7.3 (*)
+|         |    +--- com.android.tools:sdk-common:31.7.3 (*)
+|         |    +--- net.sf.kxml:kxml2:2.3.0
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         +--- com.android.tools.lint:lint-typedef-remover:31.7.3
+|         |    +--- com.android.tools:annotations:31.7.3
+|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    \--- org.ow2.asm:asm:9.6
+|         +--- androidx.databinding:databinding-compiler-common:8.7.3
+|         |    +--- androidx.databinding:databinding-common:8.7.3
+|         |    +--- com.android.databinding:baseLibrary:8.7.3
+|         |    +--- com.android.tools:annotations:31.7.3
+|         |    +--- com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10
+|         |    |    +--- com.google.code.gson:gson:2.8.0 -> 2.10.1
+|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 2.1.10 (*)
+|         |    +--- com.google.code.gson:gson:2.10.1
+|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    +--- com.googlecode.juniversalchardet:juniversalchardet:1.0.3
+|         |    +--- com.squareup:javapoet:1.10.0 -> 1.13.0
+|         |    +--- commons-io:commons-io:2.13.0
+|         |    +--- org.glassfish.jaxb:jaxb-runtime:2.3.2 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         +--- androidx.databinding:databinding-common:8.7.3
+|         +--- com.android.databinding:baseLibrary:8.7.3
+|         +--- com.android.tools.build:builder-test-api:8.7.3
+|         |    +--- com.android.tools.ddms:ddmlib:31.7.3 (*)
+|         |    +--- com.android.tools:annotations:31.7.3
+|         |    +--- com.android.tools:common:31.7.3 (*)
+|         |    \--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         +--- com.android.tools.layoutlib:layoutlib-api:31.7.3 (*)
+|         +--- com.android.tools.utp:android-device-provider-ddmlib-proto:31.7.3
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-device-provider-gradle-proto:31.7.3
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-device-provider-profile-proto:31.7.3
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.7.3
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-test-plugin-host-coverage-proto:31.7.3
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.7.3
+|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-test-plugin-host-logcat-proto:31.7.3
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.7.3
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.3
+|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.7.3
+|         |    +--- com.google.code.gson:gson:2.10.1
+|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    +--- io.grpc:grpc-core:1.57.0
+|         |    |    +--- io.grpc:grpc-api:1.57.0
+|         |    |    |    +--- com.google.code.findbugs:jsr305:3.0.2
+|         |    |    |    +--- com.google.errorprone:error_prone_annotations:2.18.0 -> 2.28.0
+|         |    |    |    \--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
+|         |    |    +--- com.google.code.gson:gson:2.10.1
+|         |    |    +--- com.google.android:annotations:4.1.1.4
+|         |    |    +--- org.codehaus.mojo:animal-sniffer-annotations:1.23
+|         |    |    +--- com.google.errorprone:error_prone_annotations:2.18.0 -> 2.28.0
+|         |    |    +--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
+|         |    |    +--- io.perfmark:perfmark-api:0.26.0
+|         |    |    \--- io.grpc:grpc-context:1.57.0
+|         |    |         \--- io.grpc:grpc-api:1.57.0 (*)
+|         |    +--- io.grpc:grpc-netty:1.57.0
+|         |    |    +--- io.grpc:grpc-core:1.57.0 (*)
+|         |    |    +--- io.netty:netty-codec-http2:4.1.93.Final
+|         |    |    |    +--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    +--- io.netty:netty-buffer:4.1.93.Final
+|         |    |    |    |    \--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    +--- io.netty:netty-transport:4.1.93.Final
+|         |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
+|         |    |    |    |    \--- io.netty:netty-resolver:4.1.93.Final
+|         |    |    |    |         \--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    +--- io.netty:netty-codec:4.1.93.Final
+|         |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
+|         |    |    |    |    \--- io.netty:netty-transport:4.1.93.Final (*)
+|         |    |    |    +--- io.netty:netty-handler:4.1.93.Final
+|         |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    |    +--- io.netty:netty-resolver:4.1.93.Final (*)
+|         |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
+|         |    |    |    |    +--- io.netty:netty-transport:4.1.93.Final (*)
+|         |    |    |    |    +--- io.netty:netty-transport-native-unix-common:4.1.93.Final
+|         |    |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
+|         |    |    |    |    |    \--- io.netty:netty-transport:4.1.93.Final (*)
+|         |    |    |    |    \--- io.netty:netty-codec:4.1.93.Final (*)
+|         |    |    |    \--- io.netty:netty-codec-http:4.1.93.Final
+|         |    |    |         +--- io.netty:netty-common:4.1.93.Final
+|         |    |    |         +--- io.netty:netty-buffer:4.1.93.Final (*)
+|         |    |    |         +--- io.netty:netty-transport:4.1.93.Final (*)
+|         |    |    |         +--- io.netty:netty-codec:4.1.93.Final (*)
+|         |    |    |         \--- io.netty:netty-handler:4.1.93.Final (*)
+|         |    |    +--- io.netty:netty-handler-proxy:4.1.93.Final
+|         |    |    |    +--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
+|         |    |    |    +--- io.netty:netty-transport:4.1.93.Final (*)
+|         |    |    |    +--- io.netty:netty-codec:4.1.93.Final (*)
+|         |    |    |    +--- io.netty:netty-codec-socks:4.1.93.Final
+|         |    |    |    |    +--- io.netty:netty-common:4.1.93.Final
+|         |    |    |    |    +--- io.netty:netty-buffer:4.1.93.Final (*)
+|         |    |    |    |    +--- io.netty:netty-transport:4.1.93.Final (*)
+|         |    |    |    |    \--- io.netty:netty-codec:4.1.93.Final (*)
+|         |    |    |    \--- io.netty:netty-codec-http:4.1.93.Final (*)
+|         |    |    +--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
+|         |    |    +--- com.google.errorprone:error_prone_annotations:2.18.0 -> 2.28.0
+|         |    |    +--- io.perfmark:perfmark-api:0.26.0
+|         |    |    \--- io.netty:netty-transport-native-unix-common:4.1.93.Final (*)
+|         |    +--- io.grpc:grpc-protobuf:1.57.0
+|         |    |    +--- io.grpc:grpc-api:1.57.0 (*)
+|         |    |    +--- com.google.code.findbugs:jsr305:3.0.2
+|         |    |    +--- com.google.protobuf:protobuf-java:3.22.3
+|         |    |    +--- com.google.api.grpc:proto-google-common-protos:2.17.0
+|         |    |    |    \--- com.google.protobuf:protobuf-java:3.21.12 -> 3.22.3
+|         |    |    +--- io.grpc:grpc-protobuf-lite:1.57.0
+|         |    |    |    +--- io.grpc:grpc-api:1.57.0 (*)
+|         |    |    |    +--- com.google.code.findbugs:jsr305:3.0.2
+|         |    |    |    \--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
+|         |    |    \--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
+|         |    +--- io.grpc:grpc-stub:1.57.0
+|         |    |    +--- io.grpc:grpc-api:1.57.0 (*)
+|         |    |    +--- com.google.guava:guava:32.0.1-android -> 33.3.1-jre (*)
+|         |    |    \--- com.google.errorprone:error_prone_annotations:2.18.0 -> 2.28.0
+|         |    +--- javax.annotation:javax.annotation-api:1.3.2
+|         |    \--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         +--- com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
+|         +--- org.apache.httpcomponents:httpmime:4.5.6 (*)
+|         +--- commons-io:commons-io:2.13.0
+|         +--- org.ow2.asm:asm:9.6
+|         +--- org.ow2.asm:asm-analysis:9.6
+|         |    \--- org.ow2.asm:asm-tree:9.6
+|         |         \--- org.ow2.asm:asm:9.6
+|         +--- org.ow2.asm:asm-commons:9.6
+|         |    +--- org.ow2.asm:asm:9.6
+|         |    \--- org.ow2.asm:asm-tree:9.6 (*)
+|         +--- org.ow2.asm:asm-util:9.6
+|         |    +--- org.ow2.asm:asm:9.6
+|         |    +--- org.ow2.asm:asm-tree:9.6 (*)
+|         |    \--- org.ow2.asm:asm-analysis:9.6 (*)
+|         +--- org.bouncycastle:bcpkix-jdk18on:1.77 (*)
+|         +--- org.glassfish.jaxb:jaxb-runtime:2.3.2 (*)
+|         +--- net.sf.jopt-simple:jopt-simple:4.9
+|         +--- com.android.tools.build:bundletool:1.17.1
+|         |    +--- com.android.tools.build:aapt2-proto:7.3.0-alpha07-8248216 -> 8.7.3-12006047 (*)
+|         |    +--- com.google.auto.value:auto-value-annotations:1.6.2
+|         |    +--- com.google.errorprone:error_prone_annotations:2.3.1 -> 2.28.0
+|         |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    +--- com.google.protobuf:protobuf-java:3.22.3
+|         |    +--- com.google.protobuf:protobuf-java-util:3.22.3
+|         |    |    +--- com.google.protobuf:protobuf-java:3.22.3
+|         |    |    +--- com.google.code.findbugs:jsr305:3.0.2
+|         |    |    +--- com.google.code.gson:gson:2.8.9 -> 2.10.1
+|         |    |    +--- com.google.errorprone:error_prone_annotations:2.11.0 -> 2.28.0
+|         |    |    +--- com.google.guava:guava:31.1-jre -> 33.3.1-jre (*)
+|         |    |    \--- com.google.j2objc:j2objc-annotations:1.3 -> 3.0.0
+|         |    +--- com.google.dagger:dagger:2.28.3
+|         |    |    \--- javax.inject:javax.inject:1
+|         |    +--- javax.inject:javax.inject:1
+|         |    +--- org.bitbucket.b_c:jose4j:0.9.5
+|         |    \--- org.slf4j:slf4j-api:1.7.30 -> 2.0.16
+|         +--- com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10 (*)
+|         +--- com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
+|         |    +--- com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10 (*)
+|         |    +--- org.ow2.asm:asm:8.0.1 -> 9.6
+|         |    +--- org.ow2.asm:asm-util:8.0.1 -> 9.6 (*)
+|         |    +--- org.ow2.asm:asm-commons:8.0.1 -> 9.6 (*)
+|         |    +--- org.jdom:jdom2:2.0.6
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 2.1.10 (*)
+|         +--- com.squareup:javapoet:1.10.0 -> 1.13.0
+|         +--- com.google.protobuf:protobuf-java:3.22.3
+|         +--- com.google.protobuf:protobuf-java-util:3.22.3 (*)
+|         +--- com.google.code.gson:gson:2.10.1
+|         +--- io.grpc:grpc-core:1.57.0 (*)
+|         +--- io.grpc:grpc-netty:1.57.0 (*)
+|         +--- io.grpc:grpc-protobuf:1.57.0 (*)
+|         +--- io.grpc:grpc-stub:1.57.0 (*)
+|         +--- com.google.crypto.tink:tink:1.7.0
+|         |    +--- com.google.protobuf:protobuf-java:3.19.3 -> 3.22.3
+|         |    \--- com.google.code.gson:gson:2.8.9 -> 2.10.1
+|         +--- com.google.testing.platform:core-proto:0.0.9-alpha02
+|         +--- com.google.flatbuffers:flatbuffers-java:1.12.0
+|         +--- org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
+|         |    +--- org.checkerframework:checker-qual:2.5.8 -> 3.43.0
+|         |    \--- com.google.flatbuffers:flatbuffers-java:1.12.0
+|         +--- com.android.tools.build:builder:8.7.3
+|         |    +--- com.android.tools.build:builder-model:8.7.3 (*)
+|         |    +--- com.android.tools.build:builder-test-api:8.7.3 (*)
+|         |    +--- com.android.tools:sdklib:31.7.3 (*)
+|         |    +--- com.android.tools:sdk-common:31.7.3 (*)
+|         |    +--- com.android.tools:common:31.7.3 (*)
+|         |    +--- com.android.tools.ddms:ddmlib:31.7.3 (*)
+|         |    +--- com.android:signflinger:8.7.3
+|         |    |    +--- com.android.tools:annotations:31.7.3
+|         |    |    +--- com.android.tools.build:apksig:8.7.3
+|         |    |    \--- com.android:zipflinger:8.7.3
+|         |    |         \--- com.android.tools:annotations:31.7.3
+|         |    +--- com.android.tools.analytics-library:protos:31.7.3 (*)
+|         |    +--- com.android.tools.analytics-library:tracker:31.7.3
+|         |    |    +--- com.android.tools.analytics-library:protos:31.7.3 (*)
+|         |    |    +--- com.android.tools.analytics-library:shared:31.7.3 (*)
+|         |    |    +--- com.android.tools:annotations:31.7.3
+|         |    |    +--- com.android.tools:common:31.7.3 (*)
+|         |    |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    |    +--- com.google.protobuf:protobuf-java:3.22.3
+|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    +--- com.android.tools.layoutlib:layoutlib-api:31.7.3 (*)
+|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    +--- org.bouncycastle:bcpkix-jdk18on:1.77 (*)
+|         |    +--- commons-codec:commons-codec:1.10 -> 1.11
+|         |    +--- org.bouncycastle:bcprov-jdk18on:1.77
+|         |    +--- javax.inject:javax.inject:1
+|         |    +--- org.ow2.asm:asm-commons:9.6 (*)
+|         |    +--- com.android.tools.build:manifest-merger:31.7.3
+|         |    |    +--- com.android.tools:common:31.7.3 (*)
+|         |    |    +--- com.android.tools:sdklib:31.7.3 (*)
+|         |    |    +--- com.android.tools:sdk-common:31.7.3 (*)
+|         |    |    +--- com.google.code.gson:gson:2.10.1
+|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|         |    +--- com.android:zipflinger:8.7.3 (*)
+|         |    +--- com.android.tools.build:apksig:8.7.3
+|         |    +--- com.android.tools.build:apkzlib:8.7.3
+|         |    |    +--- com.android.tools.build:apksig:8.7.3
+|         |    |    +--- com.google.code.findbugs:jsr305:3.0.2
+|         |    |    +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|         |    |    +--- org.bouncycastle:bcpkix-jdk18on:1.77 (*)
+|         |    |    \--- org.bouncycastle:bcprov-jdk18on:1.77
+|         |    \--- com.squareup:javawriter:2.5.0
+|         +--- com.android.tools.build:builder-model:8.7.3 (*)
+|         \--- com.android.tools.build:gradle-api:8.7.3
+|              +--- com.android.tools.build:builder-test-api:8.7.3 (*)
+|              +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
+|              +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 2.0.21 (*)
+|              \--- org.ow2.asm:asm:9.6
-\--- com.android.library:com.android.library.gradle.plugin:8.8.1
-     \--- com.android.tools.build:gradle:8.8.1 (*)
+\--- com.android.library:com.android.library.gradle.plugin:8.7.3
+     \--- com.android.tools.build:gradle:8.7.3 (*)

@nbradbury nbradbury changed the title Reverted to AGP 8.7.3 Revert to AGP 8.7.3 May 28, 2025
@nbradbury nbradbury requested review from adalpari and dcalhoun May 28, 2025 15:51
@nbradbury nbradbury marked this pull request as ready for review May 28, 2025 15:51
@nbradbury nbradbury requested a review from a team as a code owner May 28, 2025 15:51

@dcalhoun dcalhoun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am unable to reproduce the original issue. Do you have explicit steps you can share?

Also, if we are targeting a hot fix, we might should update the base branch to be the release branch.

Comment thread gradle/libs.versions.toml Outdated
@nbradbury

nbradbury commented May 28, 2025

Copy link
Copy Markdown
Contributor Author

I am unable to reproduce the original issue. Do you have explicit steps you can share?

Try this:

  • Set the device/emulator language to something other than English
  • Change the app language to English
  • Return to the main activity and switch tabs

In my case this always reverts back to the device language. Note that the Google Issue says, "So far only noticed this on Android 15 (Pixel 8 with latest updates)."

@nbradbury nbradbury changed the base branch from trunk to release/25.8.1 May 28, 2025 17:28
@nbradbury nbradbury changed the base branch from release/25.8.1 to trunk May 28, 2025 17:28
@nbradbury

Copy link
Copy Markdown
Contributor Author

Also, if we are targeting a hot fix, we might should update the base branch to be the release branch.

Yes, now that it's decided to do a hotfix I'll submit another PR which targets the release branch.

@nbradbury nbradbury closed this May 28, 2025
@dcalhoun

Copy link
Copy Markdown
Member

Note that the Google Issue says, "So far only noticed this on Android 15 (Pixel 8 with latest updates)."

This was my issue. I can reproduce the problem on a Pixel emulator, but not my physical Samsung Galaxy S20.

@sonarqubecloud

Copy link
Copy Markdown

@dcalhoun dcalhoun deleted the issue/CMM-401-wrong-locale branch May 28, 2025 17:35
@dcalhoun dcalhoun mentioned this pull request Jul 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants