diff --git a/.github/ISSUE_TEMPLATE/dependency.md b/.github/ISSUE_TEMPLATE/dependency.md index 7aa7b5af..7672ec1d 100644 --- a/.github/ISSUE_TEMPLATE/dependency.md +++ b/.github/ISSUE_TEMPLATE/dependency.md @@ -18,6 +18,7 @@ For a Gradle dependency: For Gradle itself: 1. Update the Gradle version in `gradle/wrapper/gradle-wrapper.properties` 1. Update the [Gradle SHA](https://gradle.org/release-checksums/) in `gradle/wrapper/gradle-wrapper.properties` -1. Update the Gradle wrapper by running `./gradlew wrapper` +1. Update the Gradle wrapper by running `./gradlew wrapper --write-locks` +1. Verify no unexpected entries appear in the lockfiles. _A supply chain attack could occur during this stage. The lockfile narrows the supply chain attack window to this very moment (as opposed to every time a build occurs)_ 1. Re-add the [Gradle SHA](https://gradle.org/release-checksums/) to `gradle/wrapper/gradle-wrapper.properties` 1. Are there any new APIs or possible migrations? diff --git a/build-conventions-secant/buildscript-gradle.lockfile b/build-conventions-secant/buildscript-gradle.lockfile index 8f2c7015..02326a75 100644 --- a/build-conventions-secant/buildscript-gradle.lockfile +++ b/build-conventions-secant/buildscript-gradle.lockfile @@ -12,34 +12,36 @@ 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.3.3=classpath -org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.3.3=classpath +org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:2.4.1=classpath +org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.4.1=classpath org.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.kotlin:kotlin-android-extensions:1.7.10=classpath +org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath +org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath +org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath +org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath +org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath +org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath +org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath +org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath +org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath +org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.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 99f00c12..cd454c05 100644 --- a/build-conventions-secant/gradle.lockfile +++ b/build-conventions-secant/gradle.lockfile @@ -111,46 +111,47 @@ org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtime org.jetbrains.kotlin:kotlin-android-extensions:1.7.20=runtimeClasspath org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.20=runtimeClasspath org.jetbrains.kotlin:kotlin-build-common:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.20=runtimeClasspath org.jetbrains.kotlin:kotlin-compiler-runner:1.7.20=runtimeClasspath org.jetbrains.kotlin:kotlin-daemon-client:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.20=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.7.20=runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.20=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-native-utils:1.6.21=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-native-utils:1.7.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-project-model:1.6.21=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-project-model:1.7.20=compileClasspath,runtimeClasspath 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-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-common:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.20=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-common:1.7.10=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-jdk7:1.7.10=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-jdk8:1.7.10=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-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-tooling-core:1.7.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-util-io:1.6.21=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-util-io:1.7.20=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-util-klib:1.7.20=runtimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=runtimeClasspath @@ -167,4 +168,4 @@ org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=runtimeClasspath wtf.emulator:gradle-plugin:0.0.12=compileClasspath,runtimeClasspath xerces:xercesImpl:2.12.0=runtimeClasspath xml-apis:xml-apis:1.4.01=runtimeClasspath -empty=annotationProcessor +empty=annotationProcessor,kotlinScriptDefExtensions diff --git a/buildSrc/buildscript-gradle.lockfile b/buildSrc/buildscript-gradle.lockfile index 2659d325..4d8293b5 100644 --- a/buildSrc/buildscript-gradle.lockfile +++ b/buildSrc/buildscript-gradle.lockfile @@ -12,34 +12,36 @@ 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.3.3=classpath -org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.3.3=classpath +org.gradle.kotlin.kotlin-dsl.base:org.gradle.kotlin.kotlin-dsl.base.gradle.plugin:2.4.1=classpath +org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.4.1=classpath org.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.kotlin:kotlin-android-extensions:1.7.10=classpath +org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath +org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath +org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath +org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath +org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath +org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath +org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath +org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath +org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath +org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.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 423d03eb..5f36d08d 100644 --- a/buildSrc/gradle.lockfile +++ b/buildSrc/gradle.lockfile @@ -5,24 +5,25 @@ com.googlecode.javaewah:JavaEWAH:1.1.13=compileClasspath,testCompileClasspath,te 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.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.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.30=compileClasspath,testCompileClasspath,testRuntimeClasspath -empty=annotationProcessor,testAnnotationProcessor +empty=annotationProcessor,kotlinScriptDefExtensions,testAnnotationProcessor,testKotlinScriptDefExtensions diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index e7d2d325..d4b731ce 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -135,15 +135,15 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.20=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.20=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.20=classpath -org.jetbrains.kotlin:kotlin-reflect:1.6.21=classpath +org.jetbrains.kotlin:kotlin-reflect:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.20=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.20=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.20=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.20=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-stdlib-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.20=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.20=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.20=classpath diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832..943f0cbf 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 b4986b07..8076a360 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,8 @@ #Mon Sep 19 10:46:29 CEST 2022 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip -distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi 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 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b238..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME%