diff --git a/.github/ISSUE_TEMPLATE/dependency.md b/.github/ISSUE_TEMPLATE/dependency.md
index 7672ec1d..4abac482 100644
--- a/.github/ISSUE_TEMPLATE/dependency.md
+++ b/.github/ISSUE_TEMPLATE/dependency.md
@@ -20,5 +20,4 @@ For Gradle itself:
 1. Update the [Gradle SHA](https://gradle.org/release-checksums/) in `gradle/wrapper/gradle-wrapper.properties`
 1. Update the Gradle wrapper by running `./gradlew wrapper --write-locks`
 1. Verify no unexpected entries appear in the lockfiles. _A supply chain attack could occur during this stage. The lockfile narrows the supply chain attack window to this very moment (as opposed to every time a build occurs)_
-1. Re-add the [Gradle SHA](https://gradle.org/release-checksums/) to `gradle/wrapper/gradle-wrapper.properties`
 1. Are there any new APIs or possible migrations?
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 712248ea..be40297f 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -572,7 +572,7 @@ jobs:
         with:
           name: Binaries
       - name: Robo test
-        timeout-minutes: 20
+        timeout-minutes: 25
         env:
           # Path depends on `release_build` job, plus path of `Download a single artifact` step
           BINARIES_ZIP_PATH: binaries.zip
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4206d77f..af96f997 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -249,7 +249,7 @@ androidComponents {
             ".readme",
         ))
 
-        if (variant.name.toLowerCase(Locale.US).contains("release")) {
+        if (variant.name.lowercase(Locale.US).contains("release")) {
             variant.packaging.resources.excludes.addAll(listOf(
                 "**/*.kotlin_metadata",
                 "DebugProbesKt.bin",
@@ -299,10 +299,10 @@ if (googlePlayServiceKeyFilePath.isNotEmpty()) {
 fladle {
     // Firebase Test Lab has min and max values that might differ from our project's
     // These are determined by `gcloud firebase test android models list`
-    @Suppress("MagicNumber", "PropertyName", "VariableNaming")
+    @Suppress("MagicNumber", "VariableNaming")
     val FIREBASE_TEST_LAB_MIN_SDK = 27 // Minimum for Pixel2.arm device
 
-    @Suppress("MagicNumber", "PropertyName", "VariableNaming")
+    @Suppress("MagicNumber", "VariableNaming")
     val FIREBASE_TEST_LAB_MAX_SDK = 33
 
     val minSdkVersion = run {
diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
index 2adb9f36..8d449106 100644
--- a/app/src/androidTest/AndroidManifest.xml
+++ b/app/src/androidTest/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-   >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- For test coverage -->
     <uses-permission
@@ -10,4 +9,5 @@
     <!-- For test coverage on API 29 only -->
     <application
         android:requestLegacyExternalStorage="true" />
+
 </manifest>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 820912b5..49ef3fbc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
     <application
         android:name="co.electriccoin.zcash.app.ZcashApplication"
         android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher_square"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name">
 
         <!-- Alias acts as the entrypoint to the application.
diff --git a/build-conventions-secant/buildscript-gradle.lockfile b/build-conventions-secant/buildscript-gradle.lockfile
index 02326a75..9c7bb9eb 100644
--- a/build-conventions-secant/buildscript-gradle.lockfile
+++ b/build-conventions-secant/buildscript-gradle.lockfile
@@ -1,47 +1,38 @@
 # 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.
-com.github.gundy:semver4j:0.16.4=classpath
-com.google.code.findbugs:jsr305:3.0.2=classpath
-com.google.code.gson:gson:2.8.9=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
-com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:29.0-jre=classpath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
-com.google.j2objc:j2objc-annotations:1.3=classpath
-de.undercouch:gradle-download-task:4.1.1=classpath
 net.java.dev.jna:jna:5.6.0=classpath
-org.checkerframework:checker-qual:2.11.1=classpath
-org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:2.4.1=classpath
-org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.4.1=classpath
+org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.0.7=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.0.7=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-assignment:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
 org.jetbrains:annotations:13.0=classpath
 empty=
diff --git a/build-conventions-secant/gradle.lockfile b/build-conventions-secant/gradle.lockfile
index f43272cc..a598f4cc 100644
--- a/build-conventions-secant/gradle.lockfile
+++ b/build-conventions-secant/gradle.lockfile
@@ -1,62 +1,63 @@
 # 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:7.4.0=runtimeClasspath
-androidx.databinding:databinding-compiler-common:7.4.0=runtimeClasspath
-com.android.databinding:baseLibrary:7.4.0=runtimeClasspath
-com.android.tools.analytics-library:crash:30.4.0=runtimeClasspath
-com.android.tools.analytics-library:protos:30.4.0=runtimeClasspath
-com.android.tools.analytics-library:shared:30.4.0=runtimeClasspath
-com.android.tools.analytics-library:tracker:30.4.0=runtimeClasspath
+androidx.databinding:databinding-common:8.0.2=runtimeClasspath
+androidx.databinding:databinding-compiler-common:8.0.2=runtimeClasspath
+com.android.databinding:baseLibrary:8.0.2=runtimeClasspath
+com.android.tools.analytics-library:crash:31.0.2=runtimeClasspath
+com.android.tools.analytics-library:protos:31.0.2=runtimeClasspath
+com.android.tools.analytics-library:shared:31.0.2=runtimeClasspath
+com.android.tools.analytics-library:tracker:31.0.2=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:7.4.0-8841542=runtimeClasspath
-com.android.tools.build:aaptcompiler:7.4.0=runtimeClasspath
-com.android.tools.build:apksig:7.4.0=compileClasspath,runtimeClasspath
-com.android.tools.build:apkzlib:7.4.0=compileClasspath,runtimeClasspath
-com.android.tools.build:builder-model:7.4.0=compileClasspath,runtimeClasspath
-com.android.tools.build:builder-test-api:7.4.0=runtimeClasspath
-com.android.tools.build:builder:7.4.0=compileClasspath,runtimeClasspath
-com.android.tools.build:bundletool:1.11.4=runtimeClasspath
-com.android.tools.build:gradle-api:7.4.0=compileClasspath,runtimeClasspath
-com.android.tools.build:gradle-settings-api:7.4.0=runtimeClasspath
-com.android.tools.build:gradle:7.4.0=compileClasspath,runtimeClasspath
-com.android.tools.build:manifest-merger:30.4.0=compileClasspath,runtimeClasspath
+com.android.tools.build:aapt2-proto:8.0.2-9289358=runtimeClasspath
+com.android.tools.build:aaptcompiler:8.0.2=runtimeClasspath
+com.android.tools.build:apksig:8.0.2=compileClasspath,runtimeClasspath
+com.android.tools.build:apkzlib:8.0.2=compileClasspath,runtimeClasspath
+com.android.tools.build:builder-model:8.0.2=compileClasspath,runtimeClasspath
+com.android.tools.build:builder-test-api:8.0.2=runtimeClasspath
+com.android.tools.build:builder:8.0.2=compileClasspath,runtimeClasspath
+com.android.tools.build:bundletool:1.13.2=runtimeClasspath
+com.android.tools.build:gradle-api:8.0.2=compileClasspath,runtimeClasspath
+com.android.tools.build:gradle-settings-api:8.0.2=runtimeClasspath
+com.android.tools.build:gradle:8.0.2=compileClasspath,runtimeClasspath
+com.android.tools.build:manifest-merger:31.0.2=compileClasspath,runtimeClasspath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=runtimeClasspath
-com.android.tools.ddms:ddmlib:30.4.0=runtimeClasspath
-com.android.tools.layoutlib:layoutlib-api:30.4.0=runtimeClasspath
-com.android.tools.lint:lint-model:30.4.0=runtimeClasspath
-com.android.tools.lint:lint-typedef-remover:30.4.0=runtimeClasspath
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.0=runtimeClasspath
-com.android.tools.utp:android-device-provider-gradle-proto:30.4.0=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.0=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.0=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.0=runtimeClasspath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.0=runtimeClasspath
-com.android.tools:annotations:30.4.0=runtimeClasspath
-com.android.tools:common:30.4.0=runtimeClasspath
-com.android.tools:dvlib:30.4.0=runtimeClasspath
-com.android.tools:repository:30.4.0=runtimeClasspath
-com.android.tools:sdk-common:30.4.0=runtimeClasspath
-com.android.tools:sdklib:30.4.0=runtimeClasspath
-com.android:signflinger:7.4.0=runtimeClasspath
-com.android:zipflinger:7.4.0=compileClasspath,runtimeClasspath
+com.android.tools.ddms:ddmlib:31.0.2=runtimeClasspath
+com.android.tools.layoutlib:layoutlib-api:31.0.2=runtimeClasspath
+com.android.tools.lint:lint-model:31.0.2=runtimeClasspath
+com.android.tools.lint:lint-typedef-remover:31.0.2=runtimeClasspath
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.0.2=runtimeClasspath
+com.android.tools.utp:android-device-provider-gradle-proto:31.0.2=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.0.2=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.0.2=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.0.2=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.0.2=runtimeClasspath
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.0.2=runtimeClasspath
+com.android.tools:annotations:31.0.2=runtimeClasspath
+com.android.tools:common:31.0.2=runtimeClasspath
+com.android.tools:dvlib:31.0.2=runtimeClasspath
+com.android.tools:repository:31.0.2=runtimeClasspath
+com.android.tools:sdk-common:31.0.2=runtimeClasspath
+com.android.tools:sdklib:31.0.2=runtimeClasspath
+com.android:signflinger:8.0.2=runtimeClasspath
+com.android:zipflinger:8.0.2=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.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.crypto.tink:tink:1.3.0-rc2=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.4.0=runtimeClasspath
+com.google.errorprone:error_prone_annotations:2.10.0=runtimeClasspath
 com.google.flatbuffers:flatbuffers-java:1.12.0=runtimeClasspath
 com.google.guava:failureaccess:1.0.1=runtimeClasspath
-com.google.guava:guava:30.1-jre=runtimeClasspath
+com.google.guava:guava:31.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.jimfs:jimfs:1.1=runtimeClasspath
-com.google.protobuf:protobuf-java-util:3.17.2=runtimeClasspath
-com.google.protobuf:protobuf-java:3.17.2=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.googlecode.juniversalchardet:juniversalchardet:1.0.3=runtimeClasspath
 com.squareup:javapoet:1.10.0=runtimeClasspath
@@ -66,27 +67,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.4=runtimeClasspath
+commons-io:commons-io:2.12.0=runtimeClasspath
 commons-logging:commons-logging:1.2=runtimeClasspath
 io.github.detekt.sarif4k:sarif4k:0.0.1=runtimeClasspath
 io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0=compileClasspath,runtimeClasspath
-io.grpc:grpc-api:1.39.0=runtimeClasspath
-io.grpc:grpc-context:1.39.0=runtimeClasspath
-io.grpc:grpc-core:1.39.0=runtimeClasspath
-io.grpc:grpc-netty:1.39.0=runtimeClasspath
-io.grpc:grpc-protobuf-lite:1.39.0=runtimeClasspath
-io.grpc:grpc-protobuf:1.39.0=runtimeClasspath
-io.grpc:grpc-stub:1.39.0=runtimeClasspath
-io.netty:netty-buffer:4.1.52.Final=runtimeClasspath
-io.netty:netty-codec-http2:4.1.52.Final=runtimeClasspath
-io.netty:netty-codec-http:4.1.52.Final=runtimeClasspath
-io.netty:netty-codec-socks:4.1.52.Final=runtimeClasspath
-io.netty:netty-codec:4.1.52.Final=runtimeClasspath
-io.netty:netty-common:4.1.52.Final=runtimeClasspath
-io.netty:netty-handler-proxy:4.1.52.Final=runtimeClasspath
-io.netty:netty-handler:4.1.52.Final=runtimeClasspath
-io.netty:netty-resolver:4.1.52.Final=runtimeClasspath
-io.netty:netty-transport:4.1.52.Final=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
 jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath
@@ -98,12 +100,12 @@ net.sf.jopt-simple:jopt-simple:4.9=runtimeClasspath
 net.sf.kxml:kxml2:2.3.0=runtimeClasspath
 org.apache.commons:commons-compress:1.20=runtimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath
-org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath
+org.apache.httpcomponents:httpcore:4.4.15=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.5.0=runtimeClasspath
+org.checkerframework:checker-qual:3.12.0=runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.19=runtimeClasspath
 org.glassfish.jaxb:jaxb-runtime:2.3.2=runtimeClasspath
 org.glassfish.jaxb:txw2:2.3.2=runtimeClasspath
@@ -111,44 +113,50 @@ org.jdom:jdom2:2.0.6=runtimeClasspath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-android-extensions:1.8.21=runtimeClasspath
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.21=runtimeClasspath
 org.jetbrains.kotlin:kotlin-compiler-runner:1.8.21=runtimeClasspath
 org.jetbrains.kotlin:kotlin-daemon-client:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.21=runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.8.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.21=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.21=runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.21=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.8.21=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-native-utils:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-native-utils:1.8.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-project-model:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-project-model:1.8.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.7.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.8.10=compileClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-common:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=compileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=compileClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.7.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.8.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-util-io:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-util-io:1.8.21=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-util-klib:1.8.21=runtimeClasspath
 org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin:0.7.0-Alpha=compileClasspath,runtimeClasspath
@@ -168,12 +176,12 @@ org.ow2.asm:asm-util:9.2=runtimeClasspath
 org.ow2.asm:asm:9.2=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.10.2=runtimeClasspath
-wtf.emulator:gradle-compat-6-6:0.10.2=runtimeClasspath
-wtf.emulator:gradle-compat-7-6:0.10.2=runtimeClasspath
-wtf.emulator:gradle-compat-api:0.10.2=runtimeClasspath
-wtf.emulator:gradle-compat:0.10.2=runtimeClasspath
-wtf.emulator:gradle-plugin:0.10.2=compileClasspath,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
 empty=annotationProcessor,kotlinScriptDefExtensions
diff --git a/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts
index 8139d201..7a6357f4 100644
--- a/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts
+++ b/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts
@@ -126,7 +126,7 @@ fun com.android.build.gradle.BaseExtension.configureBaseExtension() {
 
         @Suppress("UnstableApiUsage")
         managedDevices {
-            @Suppress("MagicNumber", "PropertyName", "VariableNaming")
+            @Suppress("MagicNumber", "VariableNaming")
             val MANAGED_DEVICES_MIN_SDK = 27
 
             val testDeviceMinSdkVersion = run {
diff --git a/build-conventions-secant/src/main/kotlin/secant.rosetta-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.rosetta-conventions.gradle.kts
index c5988b4f..0a942513 100644
--- a/build-conventions-secant/src/main/kotlin/secant.rosetta-conventions.gradle.kts
+++ b/build-conventions-secant/src/main/kotlin/secant.rosetta-conventions.gradle.kts
@@ -13,13 +13,13 @@ private val maxTimeoutMillis = 5000L
  * @return True if the application is running under Rosetta.
  */
 fun isRosetta(): Boolean {
-    if (System.getProperty("os.name").toLowerCase(java.util.Locale.ROOT).startsWith("mac")) {
+    if (System.getProperty("os.name").lowercase(java.util.Locale.ROOT).startsWith("mac")) {
         // Counterintuitive, but running under Rosetta is reported as Intel64 to the JVM
-        if (!System.getProperty("os.arch").toLowerCase(java.util.Locale.ROOT).contains("aarch64")) {
+        if (!System.getProperty("os.arch").lowercase(java.util.Locale.ROOT).contains("aarch64")) {
             val outputValue = Runtime.getRuntime()
-                .exec("sysctl -in sysctl.proc_translated")
+                .exec(arrayOf("sysctl -in sysctl.proc_translated"))
                 .scanOutputLine()
-                ?.toIntOrNull()
+                .toIntOrNull()
 
             if (1 == outputValue) {
                 return true
@@ -30,7 +30,7 @@ fun isRosetta(): Boolean {
     return false
 }
 
-fun Process.scanOutputLine(): String? {
+fun Process.scanOutputLine(): String {
     var outputString = ""
 
     inputStream.use { inputStream ->
diff --git a/build.gradle.kts b/build.gradle.kts
index e029af9e..609bec92 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -134,7 +134,7 @@ tasks {
 val unstableKeywords = listOf("alpha", "beta", "rc", "m", "ea", "build")
 
 fun isNonStable(version: String): Boolean {
-    val versionLowerCase = version.toLowerCase()
+    val versionLowerCase = version.lowercase()
 
     return unstableKeywords.any { versionLowerCase.contains(it) }
 }
@@ -142,10 +142,10 @@ fun isNonStable(version: String): Boolean {
 fladle {
     // Firebase Test Lab has min and max values that might differ from our project's
     // These are determined by `gcloud firebase test android models list`
-    @Suppress("MagicNumber", "PropertyName", "VariableNaming")
+    @Suppress("MagicNumber", "VariableNaming")
     val FIREBASE_TEST_LAB_MIN_SDK = 27 // Minimum for Pixel2.arm device
 
-    @Suppress("MagicNumber", "PropertyName", "VariableNaming")
+    @Suppress("MagicNumber", "VariableNaming")
     val FIREBASE_TEST_LAB_MAX_SDK = 33
 
     val minSdkVersion = run {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 64930d56..67f8771d 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -37,14 +37,6 @@ dependencyLocking {
     }
 }
 
-// Per conversation in the KotlinLang Slack, Gradle uses Java 8 compatibility internally
-// for all build scripts.
-// https://kotlinlang.slack.com/archives/C19FD9681/p1636632870122900?thread_ts=1636572288.117000&cid=C19FD9681
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 repositories {
     mavenCentral()
 }
diff --git a/buildSrc/buildscript-gradle.lockfile b/buildSrc/buildscript-gradle.lockfile
index 4d8293b5..9fc61e68 100644
--- a/buildSrc/buildscript-gradle.lockfile
+++ b/buildSrc/buildscript-gradle.lockfile
@@ -1,47 +1,38 @@
 # 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.
-com.github.gundy:semver4j:0.16.4=classpath
-com.google.code.findbugs:jsr305:3.0.2=classpath
-com.google.code.gson:gson:2.8.9=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
-com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:29.0-jre=classpath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
-com.google.j2objc:j2objc-annotations:1.3=classpath
-de.undercouch:gradle-download-task:4.1.1=classpath
 net.java.dev.jna:jna:5.6.0=classpath
-org.checkerframework:checker-qual:2.11.1=classpath
-org.gradle.kotlin.kotlin-dsl.base:org.gradle.kotlin.kotlin-dsl.base.gradle.plugin:2.4.1=classpath
-org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.4.1=classpath
+org.gradle.kotlin.kotlin-dsl.base:org.gradle.kotlin.kotlin-dsl.base.gradle.plugin:4.0.7=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.0.7=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-assignment:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
 org.jetbrains:annotations:13.0=classpath
 empty=
diff --git a/buildSrc/gradle.lockfile b/buildSrc/gradle.lockfile
index 44cbbb63..09700ba2 100644
--- a/buildSrc/gradle.lockfile
+++ b/buildSrc/gradle.lockfile
@@ -1,29 +1,47 @@
 # 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.
-com.googlecode.javaewah:JavaEWAH:1.1.13=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.googlecode.javaewah:JavaEWAH:1.1.13=buildScriptClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath
-org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r=compileClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r=buildScriptClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-native-utils:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-project-model:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.7.10=testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.8.10=compileClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=compileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=compileClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.8.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-util-io:1.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:1.7.30=buildScriptClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor,kotlinScriptDefExtensions,testAnnotationProcessor,testKotlinScriptDefExtensions
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
index 52b3172d..a41b67ff 100644
--- a/buildscript-gradle.lockfile
+++ b/buildscript-gradle.lockfile
@@ -1,46 +1,47 @@
 # 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:7.4.0=classpath
-androidx.databinding:databinding-compiler-common:7.4.0=classpath
-com.android.databinding:baseLibrary:7.4.0=classpath
-com.android.tools.analytics-library:crash:30.4.0=classpath
-com.android.tools.analytics-library:protos:30.4.0=classpath
-com.android.tools.analytics-library:shared:30.4.0=classpath
-com.android.tools.analytics-library:tracker:30.4.0=classpath
+androidx.databinding:databinding-common:8.0.2=classpath
+androidx.databinding:databinding-compiler-common:8.0.2=classpath
+com.android.databinding:baseLibrary:8.0.2=classpath
+com.android.tools.analytics-library:crash:31.0.2=classpath
+com.android.tools.analytics-library:protos:31.0.2=classpath
+com.android.tools.analytics-library:shared:31.0.2=classpath
+com.android.tools.analytics-library:tracker:31.0.2=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath
-com.android.tools.build:aapt2-proto:7.4.0-8841542=classpath
-com.android.tools.build:aaptcompiler:7.4.0=classpath
-com.android.tools.build:apksig:7.4.0=classpath
-com.android.tools.build:apkzlib:7.4.0=classpath
-com.android.tools.build:builder-model:7.4.0=classpath
-com.android.tools.build:builder-test-api:7.4.0=classpath
-com.android.tools.build:builder:7.4.0=classpath
-com.android.tools.build:bundletool:1.11.4=classpath
-com.android.tools.build:gradle-api:7.4.0=classpath
-com.android.tools.build:gradle-settings-api:7.4.0=classpath
-com.android.tools.build:gradle:7.4.0=classpath
-com.android.tools.build:manifest-merger:30.4.0=classpath
+com.android.tools.build:aapt2-proto:8.0.2-9289358=classpath
+com.android.tools.build:aaptcompiler:8.0.2=classpath
+com.android.tools.build:apksig:8.0.2=classpath
+com.android.tools.build:apkzlib:8.0.2=classpath
+com.android.tools.build:builder-model:8.0.2=classpath
+com.android.tools.build:builder-test-api:8.0.2=classpath
+com.android.tools.build:builder:8.0.2=classpath
+com.android.tools.build:bundletool:1.13.2=classpath
+com.android.tools.build:gradle-api:8.0.2=classpath
+com.android.tools.build:gradle-settings-api:8.0.2=classpath
+com.android.tools.build:gradle:8.0.2=classpath
+com.android.tools.build:manifest-merger:31.0.2=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.4.0=classpath
-com.android.tools.layoutlib:layoutlib-api:30.4.0=classpath
-com.android.tools.lint:lint-model:30.4.0=classpath
-com.android.tools.lint:lint-typedef-remover:30.4.0=classpath
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.0=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.4.0=classpath
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.0=classpath
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.0=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.0=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.0=classpath
-com.android.tools:annotations:30.4.0=classpath
-com.android.tools:common:30.4.0=classpath
-com.android.tools:dvlib:30.4.0=classpath
-com.android.tools:repository:30.4.0=classpath
-com.android.tools:sdk-common:30.4.0=classpath
-com.android.tools:sdklib:30.4.0=classpath
-com.android:signflinger:7.4.0=classpath
-com.android:zipflinger:7.4.0=classpath
+com.android.tools.ddms:ddmlib:31.0.2=classpath
+com.android.tools.layoutlib:layoutlib-api:31.0.2=classpath
+com.android.tools.lint:lint-model:31.0.2=classpath
+com.android.tools.lint:lint-typedef-remover:31.0.2=classpath
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.0.2=classpath
+com.android.tools.utp:android-device-provider-gradle-proto:31.0.2=classpath
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.0.2=classpath
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.0.2=classpath
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.0.2=classpath
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.0.2=classpath
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.0.2=classpath
+com.android.tools:annotations:31.0.2=classpath
+com.android.tools:common:31.0.2=classpath
+com.android.tools:dvlib:31.0.2=classpath
+com.android.tools:repository:31.0.2=classpath
+com.android.tools:sdk-common:31.0.2=classpath
+com.android.tools:sdklib:31.0.2=classpath
+com.android:signflinger:8.0.2=classpath
+com.android:zipflinger:8.0.2=classpath
 com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.42.0=classpathCopy,classpathCopy2
 com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.46.0=classpath
 com.github.ben-manes:gradle-versions-plugin:0.46.0=classpath
@@ -50,20 +51,20 @@ com.google.api.grpc:proto-google-common-protos:2.0.1=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.9=classpath
-com.google.crypto.tink:tink:1.3.0-rc2=classpath
+com.google.crypto.tink:tink:1.7.0=classpath
 com.google.dagger:dagger:2.28.3=classpath
-com.google.errorprone:error_prone_annotations:2.4.0=classpath
+com.google.errorprone:error_prone_annotations:2.10.0=classpath
 com.google.firebase:firebase-crashlytics-buildtools:2.9.4=classpath
 com.google.firebase:firebase-crashlytics-gradle:2.9.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.gms:google-services:4.3.15=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:31.0.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
-com.google.protobuf:protobuf-java-util:3.17.2=classpath
-com.google.protobuf:protobuf-java:3.17.2=classpath
+com.google.protobuf:protobuf-java-util:3.19.3=classpath
+com.google.protobuf:protobuf-java:3.19.3=classpath
 com.google.testing.platform:core-proto:0.0.8-alpha08=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.osacky.flank.gradle:fladle:0.17.4=classpath
@@ -81,30 +82,31 @@ com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
 com.thoughtworks.xstream:xstream:1.4.19=classpath
 com.vdurmont:semver4j:3.1.0=classpath
 commons-codec:commons-codec:1.11=classpath
-commons-io:commons-io:2.4=classpath
+commons-io:commons-io:2.12.0=classpath
 commons-logging:commons-logging:1.2=classpath
 io.github.detekt.sarif4k:sarif4k:0.0.1=classpath
 io.github.x-stream:mxparser:1.2.2=classpath
 io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0=classpath
 io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin:1.19.0=classpathCopy
 io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin:1.20.0=classpathCopy2
-io.grpc:grpc-api:1.39.0=classpath
-io.grpc:grpc-context:1.39.0=classpath
-io.grpc:grpc-core:1.39.0=classpath
-io.grpc:grpc-netty:1.39.0=classpath
-io.grpc:grpc-protobuf-lite:1.39.0=classpath
-io.grpc:grpc-protobuf:1.39.0=classpath
-io.grpc:grpc-stub:1.39.0=classpath
-io.netty:netty-buffer:4.1.52.Final=classpath
-io.netty:netty-codec-http2:4.1.52.Final=classpath
-io.netty:netty-codec-http:4.1.52.Final=classpath
-io.netty:netty-codec-socks:4.1.52.Final=classpath
-io.netty:netty-codec:4.1.52.Final=classpath
-io.netty:netty-common:4.1.52.Final=classpath
-io.netty:netty-handler-proxy:4.1.52.Final=classpath
-io.netty:netty-handler:4.1.52.Final=classpath
-io.netty:netty-resolver:4.1.52.Final=classpath
-io.netty:netty-transport:4.1.52.Final=classpath
+io.grpc:grpc-api:1.45.1=classpath
+io.grpc:grpc-context:1.45.1=classpath
+io.grpc:grpc-core:1.45.1=classpath
+io.grpc:grpc-netty:1.45.1=classpath
+io.grpc:grpc-protobuf-lite:1.45.1=classpath
+io.grpc:grpc-protobuf:1.45.1=classpath
+io.grpc:grpc-stub:1.45.1=classpath
+io.netty:netty-buffer:4.1.72.Final=classpath
+io.netty:netty-codec-http2:4.1.72.Final=classpath
+io.netty:netty-codec-http:4.1.72.Final=classpath
+io.netty:netty-codec-socks:4.1.72.Final=classpath
+io.netty:netty-codec:4.1.72.Final=classpath
+io.netty:netty-common:4.1.72.Final=classpath
+io.netty:netty-handler-proxy:4.1.72.Final=classpath
+io.netty:netty-handler:4.1.72.Final=classpath
+io.netty:netty-resolver:4.1.72.Final=classpath
+io.netty:netty-tcnative-classes:2.0.46.Final=classpath
+io.netty:netty-transport:4.1.72.Final=classpath
 io.perfmark:perfmark-api:0.23.0=classpath
 jakarta.activation:jakarta.activation-api:1.2.1=classpath
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
@@ -116,12 +118,12 @@ net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
 org.apache.commons:commons-compress:1.20=classpath
 org.apache.httpcomponents:httpclient:4.5.13=classpath
-org.apache.httpcomponents:httpcore:4.4.13=classpath
+org.apache.httpcomponents:httpcore:4.4.15=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bitbucket.b_c:jose4j:0.7.0=classpath
 org.bouncycastle:bcpkix-jdk15on:1.67=classpath
 org.bouncycastle:bcprov-jdk15on:1.67=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:3.12.0=classpath
 org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath
 org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
 org.glassfish.jaxb:txw2:2.3.2=classpath
@@ -143,15 +145,15 @@ org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-native-utils:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-project-model:1.8.21=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.8.10=classpath
 org.jetbrains.kotlin:kotlin-scripting-common:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.21=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.8.10=classpath
 org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.8.21=classpath
@@ -172,12 +174,12 @@ org.ow2.asm:asm-util:9.2=classpath
 org.ow2.asm:asm:9.2=classpath
 org.slf4j:slf4j-api:1.7.30=classpath
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
-wtf.emulator:gradle-compat-6-1:0.10.2=classpath
-wtf.emulator:gradle-compat-6-6:0.10.2=classpath
-wtf.emulator:gradle-compat-7-6:0.10.2=classpath
-wtf.emulator:gradle-compat-api:0.10.2=classpath
-wtf.emulator:gradle-compat:0.10.2=classpath
-wtf.emulator:gradle-plugin:0.10.2=classpath
+wtf.emulator:gradle-compat-6-1:0.12.2=classpath
+wtf.emulator:gradle-compat-6-6:0.12.2=classpath
+wtf.emulator:gradle-compat-7-6:0.12.2=classpath
+wtf.emulator:gradle-compat-api:0.12.2=classpath
+wtf.emulator:gradle-compat:0.12.2=classpath
+wtf.emulator:gradle-plugin:0.12.2=classpath
 xerces:xercesImpl:2.12.0=classpath
 xml-apis:xml-apis:1.4.01=classpath
 xmlpull:xmlpull:1.1.3.1=classpath
diff --git a/configuration-impl-android-lib/build.gradle.kts b/configuration-impl-android-lib/build.gradle.kts
index 13d7671d..228aa2bd 100644
--- a/configuration-impl-android-lib/build.gradle.kts
+++ b/configuration-impl-android-lib/build.gradle.kts
@@ -9,6 +9,10 @@ plugins {
 
 android {
     namespace = "co.electriccoin.zcash.configuration"
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index bb1303a7..7a2ea5d9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -100,10 +100,10 @@ ANDROID_COMPILE_SDK_VERSION=33
 
 ANDROID_NDK_VERSION=23.0.7599858
 
-ANDROID_GRADLE_PLUGIN_VERSION=7.4.0
+ANDROID_GRADLE_PLUGIN_VERSION=8.0.2
 DETEKT_VERSION=1.22.0
 DETEKT_COMPOSE_RULES_VERSION=0.1.5
-EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.10.2
+EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.12.2
 FIREBASE_CRASHLYTICS_BUILD_TOOLS_VERSION=2.9.4
 FLANK_VERSION=23.04.0
 FULLADLE_VERSION=0.17.4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbf..c1962a79 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 8076a360..2c3425d4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,7 @@
-#Mon Sep 19 10:46:29 CEST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d..aeb74cbb 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/ui-lib/build.gradle.kts b/ui-lib/build.gradle.kts
index a0a9f912..7cb3f2c3 100644
--- a/ui-lib/build.gradle.kts
+++ b/ui-lib/build.gradle.kts
@@ -16,6 +16,7 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     composeOptions {
diff --git a/ui-screenshot-test/build.gradle.kts b/ui-screenshot-test/build.gradle.kts
index c7cff2af..0f8d63dd 100644
--- a/ui-screenshot-test/build.gradle.kts
+++ b/ui-screenshot-test/build.gradle.kts
@@ -13,6 +13,8 @@ android {
     namespace = "co.electroniccoin.zcash.ui.screenshot"
     // Target needs to be set to com.android.application type module
     targetProjectPath = ":${projects.app.name}"
+    // Run tests in this module
+    experimentalProperties["android.experimental.self-instrumenting"] = true
 
     defaultConfig {
         if (isOrchestratorEnabled) {
@@ -34,7 +36,7 @@ android {
     }
     buildTypes {
         create("release") {
-            isMinifyEnabled = true
+            // To provide compatibility with other modules
         }
     }
 
diff --git a/ui-screenshot-test/proguard-consumer.txt b/ui-screenshot-test/proguard-consumer.txt
deleted file mode 100644
index e260bcc2..00000000
--- a/ui-screenshot-test/proguard-consumer.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is generated automatically by the Android Gradle plugin.
--dontwarn androidx.compose.ui.util.MathHelpersKt
--dontwarn androidx.startup.Initializer
--dontwarn com.google.common.util.concurrent.ListenableFuture
--dontwarn com.google.errorprone.annotations.CheckReturnValue
--dontwarn com.google.errorprone.annotations.InlineMe
--dontwarn com.google.errorprone.annotations.MustBeClosed
\ No newline at end of file
diff --git a/ui-screenshot-test/src/main/AndroidManifest.xml b/ui-screenshot-test/src/main/AndroidManifest.xml
index 8f5c90dd..cf00aaa7 100644
--- a/ui-screenshot-test/src/main/AndroidManifest.xml
+++ b/ui-screenshot-test/src/main/AndroidManifest.xml
@@ -5,16 +5,11 @@
 
     <!-- For test coverage -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29"/>
+        android:maxSdkVersion="29"
+        tools:ignore="ScopedStorage" />
 
     <application
         android:icon="@mipmap/ic_launcher_square"
-        android:roundIcon="@mipmap/ic_launcher_round">
+        android:roundIcon="@mipmap/ic_launcher_round" />
 
-        <!-- Now we use androidx-startup for components auto-initialization -->
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
-    </application>
 </manifest>
\ No newline at end of file