diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index af96f9971..25d698e88 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -327,12 +327,13 @@ fladle {
     flakyTestAttempts.set(1)
 
     configs {
+        val buildDirectory = layout.buildDirectory.get().asFile
         create("sanityConfigDebug") {
             clearPropertiesForSanityRobo()
 
             debugApk.set(
                 project.provider {
-                    "${buildDir}/outputs/apk/zcashmainnet/debug/app-zcashmainnet-debug.apk"
+                    "${buildDirectory}/outputs/apk/zcashmainnet/debug/app-zcashmainnet-debug.apk"
                 }
             )
 
@@ -350,7 +351,8 @@ fladle {
 
             debugApk.set(
                 project.provider {
-                    "${buildDir}/outputs/apk_from_bundle/zcashmainnetRelease/app-zcashmainnet-release-universal.apk"
+                    "$buildDirectory" +
+                        "/outputs/apk_from_bundle/zcashmainnetRelease/app-zcashmainnet-release-universal.apk"
                 }
             )
 
diff --git a/build-conventions-secant/buildscript-gradle.lockfile b/build-conventions-secant/buildscript-gradle.lockfile
index 9c7bb9eb9..f9c8c199f 100644
--- a/build-conventions-secant/buildscript-gradle.lockfile
+++ b/build-conventions-secant/buildscript-gradle.lockfile
@@ -1,38 +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.
-net.java.dev.jna:jna:5.6.0=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.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.1.0=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.1.0=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=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.kotlin:kotlin-android-extensions:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-assignment:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.9.0=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 73d1066c1..e12ab33fa 100644
--- a/build-conventions-secant/gradle.lockfile
+++ b/build-conventions-secant/gradle.lockfile
@@ -94,7 +94,7 @@ jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath
 javax.inject:javax.inject:1=runtimeClasspath
 net.java.dev.jna:jna-platform:5.6.0=runtimeClasspath
-net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,runtimeClasspath
+net.java.dev.jna:jna:5.6.0=runtimeClasspath
 net.sf.jopt-simple:jopt-simple:4.9=runtimeClasspath
 net.sf.kxml:kxml2:2.3.0=runtimeClasspath
 org.apache.commons:commons-compress:1.20=runtimeClasspath
@@ -112,50 +112,45 @@ 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.8.10=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.21=runtimeClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0=kotlinCompilerClasspath
 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.8.10=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.21=runtimeClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.8.21=compileClasspath,runtimeClasspath
-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.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.8.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-native-utils:1.8.21=compileClasspath,runtimeClasspath
-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.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-reflect:1.9.0=compileClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-script-runtime:1.9.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-common:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.0=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.21=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.21=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0=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-common:1.9.0=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-jdk7:1.9.0=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-jdk8:1.9.0=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-stdlib:1.9.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=compileClasspath,runtimeClasspath
-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
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 7a6357f41..c8d089ef4 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
@@ -199,8 +199,9 @@ fun Project.buildComposeMetricsParameters(): List<String> {
     val metricParameters = mutableListOf<String>()
     val enableMetricsProvider = project.providers.gradleProperty("IS_ENABLE_COMPOSE_COMPILER_METRICS")
     val enableMetrics = (enableMetricsProvider.orNull == "true")
+    val buildDirectory = layout.buildDirectory.get().asFile
     if (enableMetrics) {
-        val metricsFolder = File(project.buildDir, "compose-metrics")
+        val metricsFolder = File(buildDirectory, "compose-metrics")
         metricParameters.add("-P")
         metricParameters.add(
             "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + metricsFolder.absolutePath
@@ -210,7 +211,7 @@ fun Project.buildComposeMetricsParameters(): List<String> {
     val enableReportsProvider = project.providers.gradleProperty("IS_ENABLE_COMPOSE_COMPILER_REPORTS")
     val enableReports = (enableReportsProvider.orNull == "true")
     if (enableReports) {
-        val reportsFolder = File(project.buildDir, "compose-reports")
+        val reportsFolder = File(buildDirectory, "compose-reports")
         metricParameters.add("-P")
         metricParameters.add(
             "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath
diff --git a/build-conventions-secant/src/main/kotlin/secant.jacoco-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.jacoco-conventions.gradle.kts
index abef0b9a9..275992059 100644
--- a/build-conventions-secant/src/main/kotlin/secant.jacoco-conventions.gradle.kts
+++ b/build-conventions-secant/src/main/kotlin/secant.jacoco-conventions.gradle.kts
@@ -6,6 +6,7 @@ tasks {
     register("jacocoReport", JacocoReport::class) {
         group = "Coverage"
         description = "Generate XML/HTML code coverage reports for coverage.ec"
+        val buildDirectory = layout.buildDirectory.get().asFile
 
         reports {
             xml.required.set(false)
@@ -17,19 +18,19 @@ tasks {
             listOf("**/R.class", "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
 
         classDirectories.setFrom(
-            files("${buildDir}/intermediates/javac/debug").map {
+            files("${buildDirectory}/intermediates/javac/debug").map {
                 fileTree(it) {
                     exclude(fileFilter)
                 }
             },
-            files("${buildDir}/tmp/kotlin-classes/debug").map {
+            files("${buildDirectory}/tmp/kotlin-classes/debug").map {
                 fileTree(it) {
                     exclude(fileFilter)
                 }
             })
 
         executionData.setFrom(
-            files("${buildDir}/test-results").map {
+            files("${buildDirectory}/test-results").map {
                 fileTree(it) {
                     include("**/*.ec", "**/*.exec")
                 }
diff --git a/build-info-lib/build.gradle.kts b/build-info-lib/build.gradle.kts
index 5c01a728f..e534106ff 100644
--- a/build-info-lib/build.gradle.kts
+++ b/build-info-lib/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 // Note timestamp is not currently injected because it effectively disables the cache since it
 // changes with every build
 val generateBuildConfigTask = tasks.create("buildConfig") {
-    val generatedDir = "$buildDir/generated"
+    val generatedDir = layout.buildDirectory.dir("generated").get().asFile
 
     val gitInfo = co.electriccoin.zcash.Git.newInfo(parent!!.projectDir)
     //val buildTimestamp = newIso8601Timestamp()
@@ -20,7 +20,7 @@ val generateBuildConfigTask = tasks.create("buildConfig") {
     inputs.property("gitCommitCount", gitInfo.commitCount)
     //inputs.property("buildTimestamp", buildTimestamp)
 
-    outputs.dir(File(generatedDir))
+    outputs.dir(generatedDir)
 
     doLast {
         val outputFile = File("$generatedDir/co/electriccoin/zcash/build/BuildConfig.kt")
diff --git a/buildSrc/buildscript-gradle.lockfile b/buildSrc/buildscript-gradle.lockfile
index 9fc61e683..88976b26a 100644
--- a/buildSrc/buildscript-gradle.lockfile
+++ b/buildSrc/buildscript-gradle.lockfile
@@ -1,38 +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.
-net.java.dev.jna:jna:5.6.0=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.gradle.kotlin.kotlin-dsl.base:org.gradle.kotlin.kotlin-dsl.base.gradle.plugin:4.1.0=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.1.0=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=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.kotlin:kotlin-android-extensions:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-assignment:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.9.0=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 09700ba2c..f2fdbfb24 100644
--- a/buildSrc/gradle.lockfile
+++ b/buildSrc/gradle.lockfile
@@ -2,46 +2,40 @@
 # 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=buildScriptClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath
 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.8.10=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0=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-reflect:1.9.0=compileClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
 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-script-runtime:1.9.0=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-common:1.9.0=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-embeddable:1.9.0=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-compiler-impl-embeddable:1.9.0=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-scripting-jvm:1.9.0=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-common:1.9.0=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-jdk7:1.9.0=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-jdk8:1.9.0=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-stdlib:1.9.0=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=buildScriptClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor,kotlinScriptDefExtensions,testAnnotationProcessor,testKotlinScriptDefExtensions
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
index b05ea5c6e..a5b1599cf 100644
--- a/buildscript-gradle.lockfile
+++ b/buildscript-gradle.lockfile
@@ -145,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.8.10=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.9.0=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.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-stdlib-common:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.0=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
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..7f93135c4 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 2c3425d49..864d6c475 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb4..0adc8e1a5 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.