diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c560c09..278ec888 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this library adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Gradle 8.7
+- Android Gradle Plugin 8.3.0
+- Kotlin 1.9.23
+- Other dependencies update
+
 ## [2.1.0] - 2024-04-09
 
 ### Added
diff --git a/build-conventions/buildscript-gradle.lockfile b/build-conventions/buildscript-gradle.lockfile
index 3dec884a..6ff5ddb6 100644
--- a/build-conventions/buildscript-gradle.lockfile
+++ b/build-conventions/buildscript-gradle.lockfile
@@ -1,35 +1,35 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.2.1=classpath
-org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.2.1=classpath
+org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.3.0=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.3.0=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-assignment:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-assignment:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.9.22=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.9.22=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
 org.jetbrains:annotations:13.0=classpath
 empty=
diff --git a/build-conventions/gradle.lockfile b/build-conventions/gradle.lockfile
index ad236961..90a7a669 100644
--- a/build-conventions/gradle.lockfile
+++ b/build-conventions/gradle.lockfile
@@ -1,66 +1,66 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:8.1.1=runtimeClasspath
-androidx.databinding:databinding-compiler-common:8.1.1=runtimeClasspath
-com.android.databinding:baseLibrary:8.1.1=runtimeClasspath
-com.android.tools.analytics-library:crash:31.1.1=runtimeClasspath
-com.android.tools.analytics-library:protos:31.1.1=runtimeClasspath
-com.android.tools.analytics-library:shared:31.1.1=runtimeClasspath
-com.android.tools.analytics-library:tracker:31.1.1=runtimeClasspath
+androidx.databinding:databinding-common:8.3.0=runtimeClasspath
+androidx.databinding:databinding-compiler-common:8.3.0=runtimeClasspath
+com.android.databinding:baseLibrary:8.3.0=runtimeClasspath
+com.android.tools.analytics-library:crash:31.3.0=runtimeClasspath
+com.android.tools.analytics-library:protos:31.3.0=runtimeClasspath
+com.android.tools.analytics-library:shared:31.3.0=runtimeClasspath
+com.android.tools.analytics-library:tracker:31.3.0=runtimeClasspath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=runtimeClasspath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=runtimeClasspath
-com.android.tools.build:aapt2-proto:8.1.1-10154469=runtimeClasspath
-com.android.tools.build:aaptcompiler:8.1.1=runtimeClasspath
-com.android.tools.build:apksig:8.1.1=compileClasspath,runtimeClasspath
-com.android.tools.build:apkzlib:8.1.1=compileClasspath,runtimeClasspath
-com.android.tools.build:builder-model:8.1.1=compileClasspath,runtimeClasspath
-com.android.tools.build:builder-test-api:8.1.1=runtimeClasspath
-com.android.tools.build:builder:8.1.1=compileClasspath,runtimeClasspath
-com.android.tools.build:bundletool:1.14.0=runtimeClasspath
-com.android.tools.build:gradle-api:8.1.1=compileClasspath,runtimeClasspath
-com.android.tools.build:gradle-settings-api:8.1.1=runtimeClasspath
-com.android.tools.build:gradle:8.1.1=compileClasspath,runtimeClasspath
-com.android.tools.build:manifest-merger:31.1.1=compileClasspath,runtimeClasspath
+com.android.tools.build:aapt2-proto:8.3.0-10880808=runtimeClasspath
+com.android.tools.build:aaptcompiler:8.3.0=runtimeClasspath
+com.android.tools.build:apksig:8.3.0=compileClasspath,runtimeClasspath
+com.android.tools.build:apkzlib:8.3.0=compileClasspath,runtimeClasspath
+com.android.tools.build:builder-model:8.3.0=compileClasspath,runtimeClasspath
+com.android.tools.build:builder-test-api:8.3.0=runtimeClasspath
+com.android.tools.build:builder:8.3.0=compileClasspath,runtimeClasspath
+com.android.tools.build:bundletool:1.15.6=runtimeClasspath
+com.android.tools.build:gradle-api:8.3.0=compileClasspath,runtimeClasspath
+com.android.tools.build:gradle-settings-api:8.3.0=runtimeClasspath
+com.android.tools.build:gradle:8.3.0=compileClasspath,runtimeClasspath
+com.android.tools.build:manifest-merger:31.3.0=compileClasspath,runtimeClasspath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=runtimeClasspath
-com.android.tools.ddms:ddmlib:31.1.1=runtimeClasspath
-com.android.tools.layoutlib:layoutlib-api:31.1.1=runtimeClasspath
-com.android.tools.lint:lint-model:31.1.1=runtimeClasspath
-com.android.tools.lint:lint-typedef-remover:31.1.1=runtimeClasspath
-com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.1=runtimeClasspath
-com.android.tools.utp:android-device-provider-gradle-proto:31.1.1=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.1=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.1=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.1=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.1=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.1=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.1=runtimeClasspath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.1=runtimeClasspath
-com.android.tools:annotations:31.1.1=runtimeClasspath
-com.android.tools:common:31.1.1=runtimeClasspath
-com.android.tools:dvlib:31.1.1=runtimeClasspath
-com.android.tools:repository:31.1.1=runtimeClasspath
-com.android.tools:sdk-common:31.1.1=runtimeClasspath
-com.android.tools:sdklib:31.1.1=runtimeClasspath
-com.android:signflinger:8.1.1=runtimeClasspath
-com.android:zipflinger:8.1.1=compileClasspath,runtimeClasspath
+com.android.tools.ddms:ddmlib:31.3.0=runtimeClasspath
+com.android.tools.layoutlib:layoutlib-api:31.3.0=runtimeClasspath
+com.android.tools.lint:lint-model:31.3.0=runtimeClasspath
+com.android.tools.lint:lint-typedef-remover:31.3.0=runtimeClasspath
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.3.0=runtimeClasspath
+com.android.tools.utp:android-device-provider-gradle-proto:31.3.0=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.3.0=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.3.0=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.3.0=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.3.0=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.3.0=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.3.0=runtimeClasspath
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.3.0=runtimeClasspath
+com.android.tools:annotations:31.3.0=runtimeClasspath
+com.android.tools:common:31.3.0=runtimeClasspath
+com.android.tools:dvlib:31.3.0=runtimeClasspath
+com.android.tools:repository:31.3.0=runtimeClasspath
+com.android.tools:sdk-common:31.3.0=runtimeClasspath
+com.android.tools:sdklib:31.3.0=runtimeClasspath
+com.android:signflinger:8.3.0=runtimeClasspath
+com.android:zipflinger:8.3.0=compileClasspath,runtimeClasspath
 com.google.android:annotations:4.1.1.4=runtimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.0.1=runtimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.17.0=runtimeClasspath
 com.google.auto.value:auto-value-annotations:1.6.2=runtimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath
-com.google.code.gson:gson:2.8.9=runtimeClasspath
+com.google.code.gson:gson:2.10.1=runtimeClasspath
 com.google.crypto.tink:tink:1.7.0=runtimeClasspath
 com.google.dagger:dagger:2.28.3=runtimeClasspath
-com.google.errorprone:error_prone_annotations:2.11.0=runtimeClasspath
+com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
 com.google.flatbuffers:flatbuffers-java:1.12.0=runtimeClasspath
 com.google.guava:failureaccess:1.0.1=runtimeClasspath
-com.google.guava:guava:31.1-jre=runtimeClasspath
+com.google.guava:guava:32.0.1-jre=runtimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath
-com.google.j2objc:j2objc-annotations:1.3=runtimeClasspath
+com.google.j2objc:j2objc-annotations:2.8=runtimeClasspath
 com.google.jimfs:jimfs:1.1=runtimeClasspath
-com.google.protobuf:protobuf-java-util:3.19.3=runtimeClasspath
-com.google.protobuf:protobuf-java:3.19.3=runtimeClasspath
-com.google.testing.platform:core-proto:0.0.8-alpha08=runtimeClasspath
+com.google.protobuf:protobuf-java-util:3.22.3=runtimeClasspath
+com.google.protobuf:protobuf-java:3.22.3=runtimeClasspath
+com.google.testing.platform:core-proto:0.0.9-alpha02=runtimeClasspath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=runtimeClasspath
 com.squareup:javapoet:1.10.0=runtimeClasspath
 com.squareup:javawriter:2.5.0=compileClasspath,runtimeClasspath
@@ -69,28 +69,28 @@ com.sun.istack:istack-commons-runtime:3.0.8=runtimeClasspath
 com.sun.xml.fastinfoset:FastInfoset:1.2.16=runtimeClasspath
 com.vdurmont:semver4j:3.1.0=runtimeClasspath
 commons-codec:commons-codec:1.11=runtimeClasspath
-commons-io:commons-io:2.12.0=runtimeClasspath
+commons-io:commons-io:2.15.1=runtimeClasspath
 commons-logging:commons-logging:1.2=runtimeClasspath
-io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0=compileClasspath,runtimeClasspath
-io.grpc:grpc-api:1.45.1=runtimeClasspath
-io.grpc:grpc-context:1.45.1=runtimeClasspath
-io.grpc:grpc-core:1.45.1=runtimeClasspath
-io.grpc:grpc-netty:1.45.1=runtimeClasspath
-io.grpc:grpc-protobuf-lite:1.45.1=runtimeClasspath
-io.grpc:grpc-protobuf:1.45.1=runtimeClasspath
-io.grpc:grpc-stub:1.45.1=runtimeClasspath
-io.netty:netty-buffer:4.1.72.Final=runtimeClasspath
-io.netty:netty-codec-http2:4.1.72.Final=runtimeClasspath
-io.netty:netty-codec-http:4.1.72.Final=runtimeClasspath
-io.netty:netty-codec-socks:4.1.72.Final=runtimeClasspath
-io.netty:netty-codec:4.1.72.Final=runtimeClasspath
-io.netty:netty-common:4.1.72.Final=runtimeClasspath
-io.netty:netty-handler-proxy:4.1.72.Final=runtimeClasspath
-io.netty:netty-handler:4.1.72.Final=runtimeClasspath
-io.netty:netty-resolver:4.1.72.Final=runtimeClasspath
-io.netty:netty-tcnative-classes:2.0.46.Final=runtimeClasspath
-io.netty:netty-transport:4.1.72.Final=runtimeClasspath
-io.perfmark:perfmark-api:0.23.0=runtimeClasspath
+io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6=compileClasspath,runtimeClasspath
+io.grpc:grpc-api:1.57.0=runtimeClasspath
+io.grpc:grpc-context:1.57.0=runtimeClasspath
+io.grpc:grpc-core:1.57.0=runtimeClasspath
+io.grpc:grpc-netty:1.57.0=runtimeClasspath
+io.grpc:grpc-protobuf-lite:1.57.0=runtimeClasspath
+io.grpc:grpc-protobuf:1.57.0=runtimeClasspath
+io.grpc:grpc-stub:1.57.0=runtimeClasspath
+io.netty:netty-buffer:4.1.93.Final=runtimeClasspath
+io.netty:netty-codec-http2:4.1.93.Final=runtimeClasspath
+io.netty:netty-codec-http:4.1.93.Final=runtimeClasspath
+io.netty:netty-codec-socks:4.1.93.Final=runtimeClasspath
+io.netty:netty-codec:4.1.93.Final=runtimeClasspath
+io.netty:netty-common:4.1.93.Final=runtimeClasspath
+io.netty:netty-handler-proxy:4.1.93.Final=runtimeClasspath
+io.netty:netty-handler:4.1.93.Final=runtimeClasspath
+io.netty:netty-resolver:4.1.93.Final=runtimeClasspath
+io.netty:netty-transport-native-unix-common:4.1.93.Final=runtimeClasspath
+io.netty:netty-transport:4.1.93.Final=runtimeClasspath
+io.perfmark:perfmark-api:0.26.0=runtimeClasspath
 jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath
@@ -100,75 +100,73 @@ net.java.dev.jna:jna:5.6.0=runtimeClasspath
 net.sf.jopt-simple:jopt-simple:4.9=runtimeClasspath
 net.sf.kxml:kxml2:2.3.0=runtimeClasspath
 org.apache.commons:commons-compress:1.21=runtimeClasspath
-org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath
-org.apache.httpcomponents:httpcore:4.4.15=runtimeClasspath
+org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath
+org.apache.httpcomponents:httpcore:4.4.16=runtimeClasspath
 org.apache.httpcomponents:httpmime:4.5.6=runtimeClasspath
 org.bitbucket.b_c:jose4j:0.7.0=runtimeClasspath
 org.bouncycastle:bcpkix-jdk15on:1.67=runtimeClasspath
 org.bouncycastle:bcprov-jdk15on:1.67=runtimeClasspath
-org.checkerframework:checker-qual:3.12.0=runtimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.19=runtimeClasspath
+org.checkerframework:checker-qual:3.33.0=runtimeClasspath
+org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
 org.glassfish.jaxb:jaxb-runtime:2.3.2=runtimeClasspath
 org.glassfish.jaxb:txw2:2.3.2=runtimeClasspath
 org.jdom:jdom2:2.0.6=runtimeClasspath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.20=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-native-utils:1.9.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-project-model:1.9.21=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-android-extensions:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.22=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.23=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.23=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.23=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.23=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-native-utils:1.9.23=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-project-model:1.9.23=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.9.20=compileClasspath
-org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.20=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.20=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-util-io:1.9.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-util-klib:1.9.21=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.9.22=compileClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.22=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.23=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.20=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.23=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-util-io:1.9.23=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-util-klib:1.9.23=compileClasspath,runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=runtimeClasspath
-org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
-org.json:json:20230227=runtimeClasspath
+org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains:annotations:23.0.0=runtimeClasspath
+org.json:json:20240205=runtimeClasspath
 org.jvnet.staxex:stax-ex:1.8.1=runtimeClasspath
-org.ow2.asm:asm-analysis:9.2=runtimeClasspath
-org.ow2.asm:asm-commons:9.2=runtimeClasspath
-org.ow2.asm:asm-tree:9.2=runtimeClasspath
-org.ow2.asm:asm-util:9.2=runtimeClasspath
-org.ow2.asm:asm:9.2=compileClasspath,runtimeClasspath
+org.ow2.asm:asm-analysis:9.6=runtimeClasspath
+org.ow2.asm:asm-commons:9.6=runtimeClasspath
+org.ow2.asm:asm-tree:9.6=runtimeClasspath
+org.ow2.asm:asm-util:9.6=runtimeClasspath
+org.ow2.asm:asm:9.6=compileClasspath,runtimeClasspath
 org.slf4j:slf4j-api:1.7.30=runtimeClasspath
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=runtimeClasspath
-wtf.emulator:gradle-compat-6-1:0.12.2=runtimeClasspath
-wtf.emulator:gradle-compat-6-6:0.12.2=runtimeClasspath
-wtf.emulator:gradle-compat-7-6:0.12.2=runtimeClasspath
-wtf.emulator:gradle-compat-api:0.12.2=runtimeClasspath
-wtf.emulator:gradle-compat:0.12.2=runtimeClasspath
-wtf.emulator:gradle-plugin:0.12.2=compileClasspath,runtimeClasspath
-xerces:xercesImpl:2.12.0=runtimeClasspath
-xml-apis:xml-apis:1.4.01=runtimeClasspath
+wtf.emulator:gradle-compat-6-1:0.16.2=runtimeClasspath
+wtf.emulator:gradle-compat-6-6:0.16.2=runtimeClasspath
+wtf.emulator:gradle-compat-7-6:0.16.2=runtimeClasspath
+wtf.emulator:gradle-compat-api:0.16.2=runtimeClasspath
+wtf.emulator:gradle-compat:0.16.2=runtimeClasspath
+wtf.emulator:gradle-plugin:0.16.2=compileClasspath,runtimeClasspath
 empty=annotationProcessor,kotlinScriptDefExtensions
diff --git a/build-conventions/src/main/kotlin/zcash-sdk.android-conventions.gradle.kts b/build-conventions/src/main/kotlin/zcash-sdk.android-conventions.gradle.kts
index 391757a8..715bc6c4 100644
--- a/build-conventions/src/main/kotlin/zcash-sdk.android-conventions.gradle.kts
+++ b/build-conventions/src/main/kotlin/zcash-sdk.android-conventions.gradle.kts
@@ -176,7 +176,7 @@ fun com.android.build.gradle.BaseExtension.configureBaseExtension() {
         )
     }
 
-    if (this is CommonExtension<*, *, *, *, *>) {
+    if (this is CommonExtension<*, *, *, *, *, *>) {
         kotlinOptions {
             jvmTarget = project.property("ANDROID_JVM_TARGET").toString()
             allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
@@ -185,6 +185,6 @@ fun com.android.build.gradle.BaseExtension.configureBaseExtension() {
     }
 }
 
-fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }
diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/MainActivity.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/MainActivity.kt
index 2f05afd0..410fa701 100644
--- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/MainActivity.kt
+++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/MainActivity.kt
@@ -66,9 +66,16 @@ class MainActivity :
         appBarConfiguration =
             AppBarConfiguration(
                 setOf(
-                    R.id.nav_home, R.id.nav_address, R.id.nav_balance, R.id.nav_block, R.id.nav_private_key,
-                    R.id.nav_latest_height, R.id.nav_block_range,
-                    R.id.nav_transactions, R.id.nav_utxos, R.id.nav_send
+                    R.id.nav_home,
+                    R.id.nav_address,
+                    R.id.nav_balance,
+                    R.id.nav_block,
+                    R.id.nav_private_key,
+                    R.id.nav_latest_height,
+                    R.id.nav_block_range,
+                    R.id.nav_transactions,
+                    R.id.nav_utxos,
+                    R.id.nav_send
                 ),
                 drawerLayout
             )
diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/addresses/view/AddressesView.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/addresses/view/AddressesView.kt
index cbfbcf05..515d8f50 100644
--- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/addresses/view/AddressesView.kt
+++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/addresses/view/AddressesView.kt
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -84,7 +84,7 @@ private fun AddressesTopAppBar(onBack: () -> Unit) {
                 onClick = onBack
             ) {
                 Icon(
-                    imageVector = Icons.Filled.ArrowBack,
+                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = null
                 )
             }
diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/balance/view/BalanceView.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/balance/view/BalanceView.kt
index c529936e..85eccefc 100644
--- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/balance/view/BalanceView.kt
+++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/balance/view/BalanceView.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.outlined.Autorenew
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -82,7 +82,7 @@ private fun BalanceTopAppBar(
                 onClick = onBack
             ) {
                 Icon(
-                    imageVector = Icons.Filled.ArrowBack,
+                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = null
                 )
             }
diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/send/view/SendView.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/send/view/SendView.kt
index 7d018214..497a9d63 100644
--- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/send/view/SendView.kt
+++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/send/view/SendView.kt
@@ -14,7 +14,7 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -104,7 +104,7 @@ private fun SendTopAppBar(onBack: () -> Unit) {
                 onClick = onBack
             ) {
                 Icon(
-                    imageVector = Icons.Filled.ArrowBack,
+                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = null
                 )
             }
diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/server/view/ServerView.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/server/view/ServerView.kt
index 93f63c98..55c5c3ef 100644
--- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/server/view/ServerView.kt
+++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/server/view/ServerView.kt
@@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -112,7 +112,7 @@ private fun ServerTopAppBar(onBack: () -> Unit) {
                 onClick = onBack
             ) {
                 Icon(
-                    imageVector = Icons.Filled.ArrowBack,
+                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = null
                 )
             }
diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/transactions/view/TransactionsView.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/transactions/view/TransactionsView.kt
index e6ba4eda..f4f9bace 100644
--- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/transactions/view/TransactionsView.kt
+++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ui/screen/transactions/view/TransactionsView.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.outlined.Autorenew
 import androidx.compose.material3.Button
@@ -97,7 +98,7 @@ private fun TransactionsTopAppBar(
                 onClick = onBack
             ) {
                 Icon(
-                    imageVector = Icons.Filled.ArrowBack,
+                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = null
                 )
             }
diff --git a/gradle.properties b/gradle.properties
index 6496b2d5..3eaaf606 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@ ZCASH_ASCII_GPG_KEY=
 # Configures whether release is an unstable snapshot, therefore published to the snapshot repository.
 IS_SNAPSHOT=true
 
-LIBRARY_VERSION=2.1.0
+LIBRARY_VERSION=2.1.1
 
 # Kotlin compiler warnings can be considered errors, failing the build.
 ZCASH_IS_TREAT_WARNINGS_AS_ERRORS=true
@@ -83,66 +83,64 @@ ANDROID_COMPILE_SDK_VERSION=34
 # - Clang major version in backend-lib/build.rs
 ANDROID_NDK_VERSION=26.1.10909125
 
-ANDROID_GRADLE_PLUGIN_VERSION=8.1.1
-DETEKT_VERSION=1.23.0
-DETEKT_COMPOSE_RULES_VERSION=0.3.5
-DOKKA_VERSION=1.9.10
-EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.12.2
+ANDROID_GRADLE_PLUGIN_VERSION=8.3.0
+DETEKT_VERSION=1.23.6
+DETEKT_COMPOSE_RULES_VERSION=0.3.15
+DOKKA_VERSION=1.9.20
+EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.16.2
 FLANK_VERSION=23.10.1
 # When changing this, be sure to change build-conventions/gradle.properties#FOOJAY_TOOLCHAIN_RESOLVER_VERSION too
-FOOJAY_TOOLCHAIN_RESOLVER_VERSION=0.5.0
+FOOJAY_TOOLCHAIN_RESOLVER_VERSION=0.8.0
 FULLADLE_VERSION=0.17.4
 GRADLE_VERSIONS_PLUGIN_VERSION=0.51.0
-KSP_VERSION=1.8.20-1.0.10
-KTLINT_VERSION=1.1.0
+KSP_VERSION=1.9.23-1.0.20
+KTLINT_VERSION=1.2.1
 PROTOBUF_GRADLE_PLUGIN_VERSION=0.9.4
 RUST_GRADLE_PLUGIN_VERSION=0.9.3
 
-ANDROIDX_ACTIVITY_VERSION=1.8.1
-ANDROIDX_ANNOTATION_VERSION=1.7.0
+ANDROIDX_ACTIVITY_VERSION=1.8.2
+ANDROIDX_ANNOTATION_VERSION=1.7.1
 ANDROIDX_APPCOMPAT_VERSION=1.6.1
-ANDROIDX_COMPOSE_COMPILER_VERSION=1.5.7
-ANDROIDX_COMPOSE_MATERIAL3_VERSION=1.1.1
-ANDROIDX_COMPOSE_VERSION=1.6.2
-ANDROIDX_COMPOSE_MATERIAL_ICONS_VERSION=1.5.4
+ANDROIDX_COMPOSE_COMPILER_VERSION=1.5.11
+ANDROIDX_COMPOSE_MATERIAL3_VERSION=1.2.1
+ANDROIDX_COMPOSE_VERSION=1.6.5
+ANDROIDX_COMPOSE_MATERIAL_ICONS_VERSION=1.6.5
 ANDROIDX_CONSTRAINT_LAYOUT_VERSION=2.1.4
 ANDROIDX_CORE_VERSION=1.12.0
 ANDROIDX_DATABASE_VERSION=2.4.0
 ANDROIDX_ESPRESSO_VERSION=3.5.1
-ANDROIDX_LIFECYCLE_VERSION=2.6.2
+ANDROIDX_LIFECYCLE_VERSION=2.7.0
 ANDROIDX_MULTIDEX_VERSION=2.0.1
-ANDROIDX_NAVIGATION_VERSION=2.7.5
-ANDROIDX_NAVIGATION_COMPOSE_VERSION=2.7.5
-ANDROIDX_NAVIGATION_FRAGMENT_VERSION=2.7.5
+ANDROIDX_NAVIGATION_VERSION=2.7.7
+ANDROIDX_NAVIGATION_COMPOSE_VERSION=2.7.7
+ANDROIDX_NAVIGATION_FRAGMENT_VERSION=2.7.7
 ANDROIDX_PROFILE_INSTALLER_VERSION=1.3.1
-ANDROIDX_ROOM_VERSION=2.5.1
 ANDROIDX_SECURITY_CRYPTO_VERSION=1.1.0-alpha06
 ANDROIDX_TEST_JUNIT_VERSION=1.1.5
-ANDROIDX_TEST_MACROBENCHMARK_VERSION=1.2.2
+ANDROIDX_TEST_MACROBENCHMARK_VERSION=1.2.3
 ANDROIDX_TEST_ORCHESTRATOR_VERSION=1.4.2
 ANDROIDX_TEST_CORE_VERSION=1.5.0
 ANDROIDX_TEST_RUNNER_VERSION=1.5.2
 ANDROIDX_TRACING_VERSION=1.3.0-alpha02
-ANDROIDX_UI_AUTOMATOR_VERSION=2.3.0-alpha05
-BIP39_VERSION=1.0.7
+ANDROIDX_UI_AUTOMATOR_VERSION=2.3.0
 CORE_LIBRARY_DESUGARING_VERSION=2.0.4
-COROUTINES_OKHTTP=1.0
-GOOGLE_MATERIAL_VERSION=1.9.0
+GOOGLE_MATERIAL_VERSION=1.11.0
 GRPC_KOTLIN_VERSION=1.4.1
-GRPC_VERSION=1.60.0
-GSON_VERSION=2.9.0
-JACOCO_VERSION=0.8.9
+GRPC_VERSION=1.63.0
+GSON_VERSION=2.10.1
+JACOCO_VERSION=0.8.12
 JAVAX_ANNOTATION_VERSION=1.3.2
-JUNIT_VERSION=5.9.3
-KOTLINX_COROUTINES_VERSION=1.7.3
+JUNIT_VERSION=5.10.2
+KOTLINX_COROUTINES_VERSION=1.8.0
 KOTLINX_DATETIME_VERSION=0.5.0
-KOTLINX_IMMUTABLE_COLLECTIONS_VERSION=0.3.6
-KOTLIN_VERSION=1.9.21
-MOCKITO_KOTLIN_VERSION=2.2.0
-MOCKITO_VERSION=5.8.0
-PROTOC_VERSION=3.25.1
+KOTLINX_IMMUTABLE_COLLECTIONS_VERSION=0.3.7
+KOTLIN_VERSION=1.9.23
+MOCKITO_VERSION=5.11.0
+PROTOC_VERSION=4.26.1
 ZCASH_WALLET_PLUGINS_VERSION=1.0.1
 
+BIP39_VERSION=1.0.8
+
 # This shouldn't be changed, as Android doesn't support targets beyond Java 8
 ANDROID_JVM_TARGET=1.8
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd491..e6441136 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index db8c3baa..381baa9c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/lightwallet-client-lib/build.gradle.kts b/lightwallet-client-lib/build.gradle.kts
index b12384a6..8361d21b 100644
--- a/lightwallet-client-lib/build.gradle.kts
+++ b/lightwallet-client-lib/build.gradle.kts
@@ -129,7 +129,6 @@ dependencies {
     androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation(libs.androidx.test.core)
-    androidTestImplementation(libs.coroutines.okhttp)
     androidTestImplementation(libs.kotlin.test)
 }
 
diff --git a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/ChannelFactory.kt b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/ChannelFactory.kt
index f448c44a..af237ecf 100644
--- a/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/ChannelFactory.kt
+++ b/lightwallet-client-lib/src/main/java/co/electriccoin/lightwallet/client/internal/ChannelFactory.kt
@@ -16,7 +16,6 @@ internal class AndroidChannelFactory(context: android.content.Context) : Channel
         return AndroidChannelBuilder
             .forAddress(endpoint.host, endpoint.port)
             .context(context)
-            .enableFullStreamDecompression()
             .apply {
                 if (endpoint.isSecure) {
                     useTransportSecurity()
diff --git a/sdk-lib/build.gradle.kts b/sdk-lib/build.gradle.kts
index 754844a0..17b1d4c3 100644
--- a/sdk-lib/build.gradle.kts
+++ b/sdk-lib/build.gradle.kts
@@ -122,12 +122,10 @@ dependencies {
     // was buggy, crashing in several places. It also would require a separate test flavor because it's minimum API 26
     // because "JUnit 5 uses Java 8-specific APIs that didn't exist on Android before the Oreo release."
     androidTestImplementation(libs.androidx.multidex)
-    androidTestImplementation(libs.mockito.kotlin)
     androidTestImplementation(libs.mockito.android)
     androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation(libs.androidx.test.core)
-    androidTestImplementation(libs.coroutines.okhttp)
     androidTestImplementation(libs.kotlin.test)
     androidTestImplementation(libs.kotlinx.coroutines.test)
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ec87482c..b9f59232 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -77,7 +77,7 @@ dependencyResolutionManagement {
         }
     }
 
-    @Suppress("UnstableApiUsage", "MaxLineLength")
+    @Suppress("MaxLineLength")
     versionCatalogs {
         create("libs") {
             val androidGradlePluginVersion = extra["ANDROID_GRADLE_PLUGIN_VERSION"].toString()
@@ -98,7 +98,6 @@ dependencyResolutionManagement {
             val androidxNavigationComposeVersion = extra["ANDROIDX_NAVIGATION_COMPOSE_VERSION"].toString()
             val androidxNavigationFragmentVersion = extra["ANDROIDX_NAVIGATION_FRAGMENT_VERSION"].toString()
             val androidxProfileInstallerVersion = extra["ANDROIDX_PROFILE_INSTALLER_VERSION"].toString()
-            val androidxRoomVersion = extra["ANDROIDX_ROOM_VERSION"].toString()
             val androidxSecurityCryptoVersion = extra["ANDROIDX_SECURITY_CRYPTO_VERSION"].toString()
             val androidxTestJunitVersion = extra["ANDROIDX_TEST_JUNIT_VERSION"].toString()
             val androidxTestMacrobenchmarkVersion = extra["ANDROIDX_TEST_MACROBENCHMARK_VERSION"].toString()
@@ -108,7 +107,6 @@ dependencyResolutionManagement {
             val androidxTracingVersion = extra["ANDROIDX_TRACING_VERSION"].toString()
             val androidxUiAutomatorVersion = extra["ANDROIDX_UI_AUTOMATOR_VERSION"].toString()
             val bip39Version = extra["BIP39_VERSION"].toString()
-            val coroutinesOkhttpVersion = extra["COROUTINES_OKHTTP"].toString()
             val flankVersion = extra["FLANK_VERSION"].toString()
             val googleMaterialVersion = extra["GOOGLE_MATERIAL_VERSION"].toString()
             val grpcJavaVersion = extra["GRPC_VERSION"].toString()
@@ -121,7 +119,6 @@ dependencyResolutionManagement {
             val kotlinxCoroutinesVersion = extra["KOTLINX_COROUTINES_VERSION"].toString()
             val kotlinxDateTimeVersion = extra["KOTLINX_DATETIME_VERSION"].toString()
             val kotlinxImmutableCollectionsVersion = extra["KOTLINX_IMMUTABLE_COLLECTIONS_VERSION"].toString()
-            val mockitoKotlinVersion = extra["MOCKITO_KOTLIN_VERSION"].toString()
             val mockitoVersion = extra["MOCKITO_VERSION"].toString()
             val protocVersion = extra["PROTOC_VERSION"].toString()
             val rustGradlePluginVersion = extra["RUST_GRADLE_PLUGIN_VERSION"].toString()
@@ -159,8 +156,6 @@ dependencyResolutionManagement {
             library("androidx-navigation-fragment", "androidx.navigation:navigation-fragment-ktx:$androidxNavigationFragmentVersion")
             library("androidx-navigation-ui", "androidx.navigation:navigation-ui-ktx:$androidxNavigationVersion")
             library("androidx-profileinstaller", "androidx.profileinstaller:profileinstaller:$androidxProfileInstallerVersion")
-            library("androidx-room-compiler", "androidx.room:room-compiler:$androidxRoomVersion")
-            library("androidx-room-core", "androidx.room:room-ktx:$androidxRoomVersion")
             library("androidx-sqlite", "androidx.sqlite:sqlite-ktx:${androidxDatabaseVersion}")
             library("androidx-sqlite-framework", "androidx.sqlite:sqlite-framework:${androidxDatabaseVersion}")
             library("androidx-viewmodel-compose", "androidx.lifecycle:lifecycle-viewmodel-compose:$androidxLifecycleVersion")
@@ -206,7 +201,6 @@ dependencyResolutionManagement {
             library("androidx-test-orchestrator", "androidx.test:orchestrator:$androidxTestOrchestratorVersion")
             library("androidx-tracing", "androidx.tracing:tracing:$androidxTracingVersion")
             library("androidx-uiAutomator", "androidx.test.uiautomator:uiautomator:$androidxUiAutomatorVersion")
-            library("coroutines-okhttp", "ru.gildor.coroutines:kotlin-coroutines-okhttp:$coroutinesOkhttpVersion")
             library("grpc-testing", "io.grpc:grpc-testing:$grpcJavaVersion")
             library("junit-api", "org.junit.jupiter:junit-jupiter-api:$junitVersion")
             library("junit-engine", "org.junit.jupiter:junit-jupiter-engine:$junitVersion")
@@ -215,7 +209,6 @@ dependencyResolutionManagement {
             library("kotlinx-coroutines-test", "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
             library("mockito-android", "org.mockito:mockito-android:$mockitoVersion")
             library("mockito-junit", "org.mockito:mockito-junit-jupiter:$mockitoVersion")
-            library("mockito-kotlin", "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlinVersion")
 
             // Bundles
             bundle(