diff --git a/build-convention/gradle.lockfile b/build-convention/gradle.lockfile
index e512a2da..44a1637e 100644
--- a/build-convention/gradle.lockfile
+++ b/build-convention/gradle.lockfile
@@ -117,38 +117,39 @@ 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.dokka:dokka-core:1.4.32=runtimeClasspath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-android-extensions:1.6.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-build-common:1.6.10=runtimeClasspath
+org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=runtimeClasspath
+org.jetbrains.kotlin:kotlin-android-extensions:1.6.20=runtimeClasspath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20=runtimeClasspath
+org.jetbrains.kotlin:kotlin-build-common:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.6.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20=runtimeClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20=runtimeClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.10=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.10=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-native-utils:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-native-utils:1.6.10=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-native-utils:1.6.20=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-project-model:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-project-model:1.6.10=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-project-model:1.6.20=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.4.32=runtimeClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.5.31=compileClasspath,kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-sam-with-receiver:1.5.31=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-common:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0=runtimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0=kotlinCompilerPluginClasspathMain,runtimeClasspath
@@ -157,10 +158,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0=kotlinCompilerPluginClasspathMain,
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=compileClasspath
 org.jetbrains.kotlin:kotlin-stdlib:1.5.0=runtimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20=runtimeClasspath
 org.jetbrains.kotlin:kotlin-util-io:1.5.31=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-util-io:1.6.10=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-util-klib:1.6.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-util-io:1.6.20=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-util-klib:1.6.20=runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinCompilerPluginClasspathMain,runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1=runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=kotlinCompilerPluginClasspathMain
diff --git a/build-convention/src/main/kotlin/zcash.kotlin-multiplatform-build-conventions.gradle.kts b/build-convention/src/main/kotlin/zcash.kotlin-multiplatform-build-conventions.gradle.kts
index 3fe0713d..5fe037b1 100644
--- a/build-convention/src/main/kotlin/zcash.kotlin-multiplatform-build-conventions.gradle.kts
+++ b/build-convention/src/main/kotlin/zcash.kotlin-multiplatform-build-conventions.gradle.kts
@@ -24,7 +24,7 @@ pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
             compilations.all {
                 kotlinOptions {
                     allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
-                    freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn"
+                    freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
                 }
             }
         }
diff --git a/build-info-lib/gradle.lockfile b/build-info-lib/gradle.lockfile
index b7b1c798..4c39f51a 100644
--- a/build-info-lib/gradle.lockfile
+++ b/build-info-lib/gradle.lockfile
@@ -1,26 +1,26 @@
 # 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.
-junit:junit:4.12=jvmTestCompileClasspath,jvmTestRuntimeClasspath
+junit:junit:4.13.2=jvmTestCompileClasspath,jvmTestRuntimeClasspath
 net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.hamcrest:hamcrest-core:1.3=jvmTestCompileClasspath,jvmTestRuntimeClasspath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.10=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.6.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-scripting-common:1.6.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestImplementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCompileClasspath
-org.jetbrains.kotlin:kotlin-test-annotations-common:1.6.10=commonTestImplementationDependenciesMetadata,jvmTestImplementationDependenciesMetadata
-org.jetbrains.kotlin:kotlin-test-common:1.6.10=commonTestImplementationDependenciesMetadata,jvmTestImplementationDependenciesMetadata
-org.jetbrains.kotlin:kotlin-test-junit:1.6.10=jvmTestCompileClasspath,jvmTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-test:1.6.10=commonTestImplementationDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath
-org.jetbrains:annotations:13.0=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCompileClasspath
-empty=archives,commonMainCompileOnlyDependenciesMetadata,commonMainImplementationDependenciesMetadata,commonMainIntransitiveDependenciesMetadata,commonMainRuntimeOnlyDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestIntransitiveDependenciesMetadata,commonTestRuntimeOnlyDependenciesMetadata,default,jvmMainApiDependenciesMetadata,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainIntransitiveDependenciesMetadata,jvmMainRuntimeOnlyDependenciesMetadata,jvmTestCompileOnlyDependenciesMetadata,jvmTestIntransitiveDependenciesMetadata,jvmTestRuntimeOnlyDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,testKotlinScriptDef,testKotlinScriptDefExtensions
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.20=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.6.20=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:1.6.20=kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.20=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestImplementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.20=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+org.jetbrains.kotlin:kotlin-test-annotations-common:1.6.20=commonTestImplementationDependenciesMetadata
+org.jetbrains.kotlin:kotlin-test-common:1.6.20=commonTestImplementationDependenciesMetadata
+org.jetbrains.kotlin:kotlin-test-junit:1.6.20=jvmTestCompileClasspath,jvmTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-test:1.6.20=commonTestImplementationDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath
+org.jetbrains:annotations:13.0=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+empty=archives,commonMainCompileOnlyDependenciesMetadata,commonMainImplementationDependenciesMetadata,commonMainIntransitiveDependenciesMetadata,commonMainRuntimeOnlyDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestIntransitiveDependenciesMetadata,commonTestRuntimeOnlyDependenciesMetadata,default,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainIntransitiveDependenciesMetadata,jvmMainRuntimeOnlyDependenciesMetadata,jvmTestCompileOnlyDependenciesMetadata,jvmTestIntransitiveDependenciesMetadata,jvmTestRuntimeOnlyDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,testKotlinScriptDef,testKotlinScriptDefExtensions
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
index f4461d24..27339289 100644
--- a/buildscript-gradle.lockfile
+++ b/buildscript-gradle.lockfile
@@ -126,32 +126,32 @@ org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
 org.glassfish.jaxb:txw2:2.3.2=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.dokka:dokka-core:1.4.32=classpath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.6.10=classpath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.6.20=classpath
 org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.6.20=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1=classpath
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=classpath
diff --git a/gradle.properties b/gradle.properties
index 1da1ac0d..f693f247 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -74,7 +74,7 @@ PLAY_PUBLISHER_PLUGIN_VERSION=3.7.0
 ANDROIDX_ACTIVITY_VERSION=1.4.0
 ANDROIDX_ANNOTATION_VERSION=1.3.0
 ANDROIDX_APPCOMPAT_VERSION=1.4.1
-ANDROIDX_COMPOSE_COMPILER_VERSION=1.1.1
+ANDROIDX_COMPOSE_COMPILER_VERSION=1.2.0-alpha08
 ANDROIDX_COMPOSE_MATERIAL3_VERSION=1.0.0-alpha09
 ANDROIDX_COMPOSE_VERSION=1.1.1
 ANDROIDX_CORE_VERSION=1.7.0
@@ -91,7 +91,7 @@ ANDROIDX_UI_AUTOMATOR_VERSION=2.2.0-alpha1
 ANDROIDX_WORK_MANAGER_VERSION=2.7.1
 CORE_LIBRARY_DESUGARING_VERSION=1.1.5
 JACOCO_VERSION=0.8.8
-KOTLIN_VERSION=1.6.10
+KOTLIN_VERSION=1.6.20
 KOTLINX_COROUTINES_VERSION=1.6.1
 KOTLINX_DATETIME_VERSION=0.3.2
 ZCASH_ANDROID_WALLET_PLUGINS_VERSION=1.0.0
diff --git a/preference-api-lib/gradle.lockfile b/preference-api-lib/gradle.lockfile
index 5897826b..9e59ebdf 100644
--- a/preference-api-lib/gradle.lockfile
+++ b/preference-api-lib/gradle.lockfile
@@ -1,31 +1,32 @@
 # 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.
-junit:junit:4.12=jvmTestCompileClasspath,jvmTestRuntimeClasspath
+junit:junit:4.13.2=jvmTestCompileClasspath,jvmTestRuntimeClasspath
 net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.hamcrest:hamcrest-core:1.3=jvmTestCompileClasspath,jvmTestRuntimeClasspath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.10=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.6.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-scripting-common:1.6.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestImplementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCompileClasspath
-org.jetbrains.kotlin:kotlin-test-annotations-common:1.6.10=commonTestImplementationDependenciesMetadata,jvmTestImplementationDependenciesMetadata
-org.jetbrains.kotlin:kotlin-test-common:1.6.10=commonTestImplementationDependenciesMetadata,jvmTestImplementationDependenciesMetadata
-org.jetbrains.kotlin:kotlin-test-junit:1.6.10=jvmTestCompileClasspath,jvmTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-test:1.6.10=commonTestImplementationDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.20=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.6.20=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:1.6.20=kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.20=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestImplementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.20=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+org.jetbrains.kotlin:kotlin-test-annotations-common:1.6.20=commonTestImplementationDependenciesMetadata
+org.jetbrains.kotlin:kotlin-test-common:1.6.20=commonTestImplementationDependenciesMetadata
+org.jetbrains.kotlin:kotlin-test-junit:1.6.20=jvmTestCompileClasspath,jvmTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-test:1.6.20=commonTestImplementationDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath
+org.jetbrains.kotlinx:atomicfu:0.17.0=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1=jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1=jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1=commonMainApiDependenciesMetadata,commonTestImplementationDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCompileClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestImplementationDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.6.1=jvmTestCompileClasspath,jvmTestRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1=commonTestImplementationDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath
-org.jetbrains:annotations:13.0=commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCompileClasspath
-empty=archives,commonMainCompileOnlyDependenciesMetadata,commonMainImplementationDependenciesMetadata,commonMainIntransitiveDependenciesMetadata,commonMainRuntimeOnlyDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestIntransitiveDependenciesMetadata,commonTestRuntimeOnlyDependenciesMetadata,default,jvmMainApiDependenciesMetadata,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainIntransitiveDependenciesMetadata,jvmMainRuntimeOnlyDependenciesMetadata,jvmTestCompileOnlyDependenciesMetadata,jvmTestIntransitiveDependenciesMetadata,jvmTestRuntimeOnlyDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,testKotlinScriptDef,testKotlinScriptDefExtensions
+org.jetbrains:annotations:13.0=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath
+empty=archives,commonMainCompileOnlyDependenciesMetadata,commonMainImplementationDependenciesMetadata,commonMainIntransitiveDependenciesMetadata,commonMainRuntimeOnlyDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestIntransitiveDependenciesMetadata,commonTestRuntimeOnlyDependenciesMetadata,default,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainIntransitiveDependenciesMetadata,jvmMainRuntimeOnlyDependenciesMetadata,jvmTestCompileOnlyDependenciesMetadata,jvmTestIntransitiveDependenciesMetadata,jvmTestRuntimeOnlyDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,testKotlinScriptDef,testKotlinScriptDefExtensions
diff --git a/preference-impl-android-lib/build.gradle.kts b/preference-impl-android-lib/build.gradle.kts
index d9b9506e..31476155 100644
--- a/preference-impl-android-lib/build.gradle.kts
+++ b/preference-impl-android-lib/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     kotlinOptions {
         jvmTarget = libs.versions.java.get()
         allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
-        freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn"
+        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
     }
 
 
diff --git a/sdk-ext-lib/build.gradle.kts b/sdk-ext-lib/build.gradle.kts
index 72820d55..fd769d37 100644
--- a/sdk-ext-lib/build.gradle.kts
+++ b/sdk-ext-lib/build.gradle.kts
@@ -9,7 +9,7 @@ android {
     kotlinOptions {
         jvmTarget = libs.versions.java.get()
         allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
-        freeCompilerArgs = freeCompilerArgs.plus("-Xopt-in=kotlin.RequiresOptIn")
+        freeCompilerArgs = freeCompilerArgs.plus("-opt-in=kotlin.RequiresOptIn")
     }
 }
 
diff --git a/sdk-ext-ui-lib/build.gradle.kts b/sdk-ext-ui-lib/build.gradle.kts
index dc6edf38..ebed3c7d 100644
--- a/sdk-ext-ui-lib/build.gradle.kts
+++ b/sdk-ext-ui-lib/build.gradle.kts
@@ -9,7 +9,7 @@ android {
     kotlinOptions {
         jvmTarget = libs.versions.java.get()
         allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
-        freeCompilerArgs = freeCompilerArgs.plus("-Xopt-in=kotlin.RequiresOptIn")
+        freeCompilerArgs = freeCompilerArgs.plus("-opt-in=kotlin.RequiresOptIn")
     }
 
     resourcePrefix = "co_electriccoin_zcash_"
diff --git a/spackle-lib/build.gradle.kts b/spackle-lib/build.gradle.kts
index 50dffb6c..f0e28cfd 100644
--- a/spackle-lib/build.gradle.kts
+++ b/spackle-lib/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     kotlinOptions {
         jvmTarget = libs.versions.java.get()
         allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
-        freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn"
+        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
     }
 
     // Force orchestrator to be used for this module, because we need the preference files
diff --git a/ui-design-lib/build.gradle.kts b/ui-design-lib/build.gradle.kts
index d7a7040b..5cc6de0d 100644
--- a/ui-design-lib/build.gradle.kts
+++ b/ui-design-lib/build.gradle.kts
@@ -19,7 +19,7 @@ android {
     kotlinOptions {
         jvmTarget = libs.versions.java.get()
         allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
-        freeCompilerArgs = freeCompilerArgs.plus("-Xopt-in=kotlin.RequiresOptIn")
+        freeCompilerArgs = freeCompilerArgs.plus("-opt-in=kotlin.RequiresOptIn")
     }
 
     sourceSets {
diff --git a/ui-lib/build.gradle.kts b/ui-lib/build.gradle.kts
index d8b892ce..f1e3b07e 100644
--- a/ui-lib/build.gradle.kts
+++ b/ui-lib/build.gradle.kts
@@ -23,7 +23,7 @@ android {
     kotlinOptions {
         jvmTarget = libs.versions.java.get()
         allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
-        freeCompilerArgs = freeCompilerArgs.plus("-Xopt-in=kotlin.RequiresOptIn")
+        freeCompilerArgs = freeCompilerArgs.plus("-opt-in=kotlin.RequiresOptIn")
     }
 
     sourceSets {