diff --git a/build-conventions-secant/buildscript-gradle.lockfile b/build-conventions-secant/buildscript-gradle.lockfile index f9c8c199..3dec884a 100644 --- a/build-conventions-secant/buildscript-gradle.lockfile +++ b/build-conventions-secant/buildscript-gradle.lockfile @@ -1,38 +1,35 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.1.0=classpath -org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.1.0=classpath +org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.2.1=classpath +org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.2.1=classpath org.jetbrains.intellij.deps:trove4j:1.0.20200330=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.kotlin:kotlin-android-extensions:1.9.20=classpath +org.jetbrains.kotlin:kotlin-assignment:1.9.20=classpath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=classpath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=classpath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=classpath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.20=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.20=classpath +org.jetbrains.kotlin:kotlin-native-utils:1.9.20=classpath +org.jetbrains.kotlin:kotlin-project-model:1.9.20=classpath +org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.20=classpath +org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=classpath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath +org.jetbrains.kotlin:kotlin-tooling-core:1.9.20=classpath +org.jetbrains.kotlin:kotlin-util-io:1.9.20=classpath +org.jetbrains.kotlin:kotlin-util-klib:1.9.20=classpath org.jetbrains.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 3b00a34d..fb0d4c8f 100644 --- a/build-conventions-secant/gradle.lockfile +++ b/build-conventions-secant/gradle.lockfile @@ -124,14 +124,14 @@ org.glassfish.jaxb:txw2:2.3.2=runtimeClasspath org.jdom:jdom2:2.0.6=runtimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-android-extensions:1.9.10=runtimeClasspath -org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-build-tools-api:1.9.10=runtimeClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0=kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.10=runtimeClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-compiler-runner:1.9.10=runtimeClasspath org.jetbrains.kotlin:kotlin-daemon-client:1.9.10=runtimeClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0=kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.10=runtimeClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.10=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.10=runtimeClasspath @@ -144,25 +144,22 @@ org.jetbrains.kotlin:kotlin-native-utils:1.9.10=compileClasspath,runtimeClasspat org.jetbrains.kotlin:kotlin-project-model:1.9.10=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=runtimeClasspath -org.jetbrains.kotlin:kotlin-reflect:1.9.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.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-reflect:1.9.20=compileClasspath +org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.20=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-common:1.9.10=runtimeClasspath -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.10=runtimeClasspath -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.10=runtimeClasspath -org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.10=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=compileClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=compileClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-tooling-core:1.9.10=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-util-io:1.9.10=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-util-klib:1.9.10=compileClasspath,runtimeClasspath diff --git a/buildSrc/buildscript-gradle.lockfile b/buildSrc/buildscript-gradle.lockfile index 88976b26..e5ec2fb4 100644 --- a/buildSrc/buildscript-gradle.lockfile +++ b/buildSrc/buildscript-gradle.lockfile @@ -1,38 +1,35 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -org.gradle.kotlin.kotlin-dsl.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.gradle.kotlin.kotlin-dsl.base:org.gradle.kotlin.kotlin-dsl.base.gradle.plugin:4.2.1=classpath +org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.2.1=classpath org.jetbrains.intellij.deps:trove4j:1.0.20200330=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.kotlin:kotlin-android-extensions:1.9.20=classpath +org.jetbrains.kotlin:kotlin-assignment:1.9.20=classpath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=classpath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=classpath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=classpath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.20=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.20=classpath +org.jetbrains.kotlin:kotlin-native-utils:1.9.20=classpath +org.jetbrains.kotlin:kotlin-project-model:1.9.20=classpath +org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.20=classpath +org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=classpath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath +org.jetbrains.kotlin:kotlin-tooling-core:1.9.20=classpath +org.jetbrains.kotlin:kotlin-util-io:1.9.20=classpath +org.jetbrains.kotlin:kotlin-util-klib:1.9.20=classpath org.jetbrains.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 f2fdbfb2..418d238e 100644 --- a/buildSrc/gradle.lockfile +++ b/buildSrc/gradle.lockfile @@ -4,36 +4,33 @@ com.googlecode.javaewah:JavaEWAH:1.1.13=buildScriptClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r=buildScriptClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-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-assignment-compiler-plugin-embeddable:1.9.20=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathTest 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.9.0=compileClasspath -org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-reflect:1.9.20=compileClasspath +org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-script-runtime:1.9.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-common:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath -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.9.0=compileClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=testCompileClasspath,testRuntimeClasspath -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.9.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathTest org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index 2ae38aa1..f71601a0 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -157,15 +157,15 @@ org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.9.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.9.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.9.0=classpath +org.jetbrains.kotlin:kotlin-reflect:1.9.20=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.9.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.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-stdlib-common:1.9.20=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.9.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.9.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.9.10=classpath diff --git a/gradle.properties b/gradle.properties index 5f8e0da8..d0207a6e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,9 @@ android.nonTransitiveRClass=true android.suppressUnsupportedCompileSdk=33 android.useAndroidX=true +# Enable Kotlin metadata version check for script compilation +org.gradle.kotlin.dsl.skipMetadataVersionCheck=false + # Kotlin compiler warnings can be considered errors, failing the build. ZCASH_IS_TREAT_WARNINGS_AS_ERRORS=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c..d64cd491 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 864d6c47..db8c3baa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1a..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt index af0a202e..12cb6e57 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt @@ -13,6 +13,7 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import androidx.test.filters.MediumTest import cash.z.ecc.android.bip39.Mnemonics @@ -189,6 +190,7 @@ class RestoreViewTest : UiTestPrerequisites() { text = getStringResource(R.string.restore_birthday_button_restore), ignoreCase = true ).also { + it.performScrollTo() it.assertIsEnabled() it.performClick() }