diff --git a/build-conventions-secant/buildscript-gradle.lockfile b/build-conventions-secant/buildscript-gradle.lockfile
index 504107c9..8f2c7015 100644
--- a/build-conventions-secant/buildscript-gradle.lockfile
+++ b/build-conventions-secant/buildscript-gradle.lockfile
@@ -3,43 +3,43 @@
 # 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.6=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.1.7=classpath
-org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.1.7=classpath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=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.5.31=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:2.3.3=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.3.3=classpath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.6.21=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core: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 9dc2118b..27897006 100644
--- a/build-conventions-secant/gradle.lockfile
+++ b/build-conventions-secant/gradle.lockfile
@@ -101,7 +101,7 @@ jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:2.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=runtimeClasspath
+net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,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
@@ -118,53 +118,54 @@ 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
-org.jetbrains.intellij.deps:trove4j:1.0.20200330=runtimeClasspath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-android-extensions:1.7.0=runtimeClasspath
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.0=runtimeClasspath
 org.jetbrains.kotlin:kotlin-build-common:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.0=runtimeClasspath
 org.jetbrains.kotlin:kotlin-compiler-runner:1.7.0=runtimeClasspath
 org.jetbrains.kotlin:kotlin-daemon-client:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.0=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.0=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-native-utils:1.5.31=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-native-utils:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-native-utils:1.7.0=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-project-model:1.5.31=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-project-model:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-project-model:1.7.0=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.5.31=compileClasspath,kotlinCompilerClasspath,runtimeClasspath
-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-reflect:1.5.31=runtimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.6.21=compileClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.6.21=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-script-runtime:1.6.21=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-common:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=compileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=compileClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.5.31=runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-tooling-core:1.7.0=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.0=runtimeClasspath
-org.jetbrains.kotlin:kotlin-util-io:1.5.31=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-util-io:1.6.21=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-util-io:1.7.0=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-util-klib:1.7.0=runtimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinCompilerPluginClasspathMain,runtimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1=runtimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=kotlinCompilerPluginClasspathMain
 org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
 org.jetbrains:markdown-jvm:0.2.1=runtimeClasspath
 org.jetbrains:markdown:0.2.1=runtimeClasspath
diff --git a/build-conventions-secant/settings.gradle.kts b/build-conventions-secant/settings.gradle.kts
index 1d180cda..b16268b8 100644
--- a/build-conventions-secant/settings.gradle.kts
+++ b/build-conventions-secant/settings.gradle.kts
@@ -29,3 +29,5 @@ dependencyResolutionManagement {
         }
     }
 }
+
+rootProject.name = "build-conventions-secant"
diff --git a/build-conventions-secant/src/main/kotlin/secant.kotlin-multiplatform-build-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.kotlin-multiplatform-build-conventions.gradle.kts
index 5fe037b1..afbd91bc 100644
--- a/build-conventions-secant/src/main/kotlin/secant.kotlin-multiplatform-build-conventions.gradle.kts
+++ b/build-conventions-secant/src/main/kotlin/secant.kotlin-multiplatform-build-conventions.gradle.kts
@@ -1,11 +1,9 @@
-import org.gradle.jvm.toolchain.JavaToolchainSpec
-
 pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
     extensions.findByType<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension>()?.apply {
         jvmToolchain {
             val javaVersion = JavaVersion.toVersion(project.property("JVM_TOOLCHAIN").toString())
             val javaLanguageVersion = JavaLanguageVersion.of(javaVersion.majorVersion)
-            (this as JavaToolchainSpec).languageVersion.set(javaLanguageVersion)
+            languageVersion.set(javaLanguageVersion)
         }
 
         targets.matching { it.platformType.name == "jvm" }.all {
diff --git a/buildSrc/buildscript-gradle.lockfile b/buildSrc/buildscript-gradle.lockfile
index 56968e0d..2659d325 100644
--- a/buildSrc/buildscript-gradle.lockfile
+++ b/buildSrc/buildscript-gradle.lockfile
@@ -3,43 +3,43 @@
 # 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.6=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.1.7=classpath
-org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.1.7=classpath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=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.5.31=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.gradle.kotlin.kotlin-dsl.base:org.gradle.kotlin.kotlin-dsl.base.gradle.plugin:2.3.3=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.3.3=classpath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.6.21=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
 org.jetbrains:annotations:13.0=classpath
 empty=
diff --git a/buildSrc/gradle.lockfile b/buildSrc/gradle.lockfile
index 0498321a..423d03eb 100644
--- a/buildSrc/gradle.lockfile
+++ b/buildSrc/gradle.lockfile
@@ -2,30 +2,27 @@
 # 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
+net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath
 org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r=compileClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-native-utils:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-project-model:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-reflect:1.5.31=compileClasspath,kotlinCompilerClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=compileClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=compileClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-util-io:1.5.31=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21=kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-native-utils:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-project-model:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-reflect:1.6.21=compileClasspath,kotlinCompilerClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-script-runtime:1.6.21=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=compileClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=compileClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-util-io:1.6.21=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
 org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.30=compileClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor,testAnnotationProcessor
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 00000000..29744ec1
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "buildSrc"
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
index 60a8c7f9..33b15045 100644
--- a/buildscript-gradle.lockfile
+++ b/buildscript-gradle.lockfile
@@ -145,15 +145,15 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0=classpath
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.0=classpath
 org.jetbrains.kotlin:kotlin-native-utils:1.7.0=classpath
 org.jetbrains.kotlin:kotlin-project-model:1.7.0=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.6.21=classpath
 org.jetbrains.kotlin:kotlin-scripting-common:1.7.0=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.0=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.0=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.0=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-stdlib-common:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21=classpath
 org.jetbrains.kotlin:kotlin-tooling-core:1.7.0=classpath
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.0=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.7.0=classpath
diff --git a/gradle.properties b/gradle.properties
index 522e17ca..c6a13f74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,9 @@
 # Speed up builds.  Keep these flags here for quick debugging of issues.
-# https://github.com/gradle/gradle/issues/13382
-org.gradle.vfs.watch=false
-org.gradle.configureondemand=false
 org.gradle.caching=true
-org.gradle.parallel=true
+org.gradle.configureondemand=false
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
+org.gradle.parallel=true
+org.gradle.vfs.watch=true
 
 kotlin.mpp.stability.nowarn=true
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a..249e5832 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 17308415..1986a903 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c7873..a69d9cb6 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..53a6b238 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal