diff --git a/.github/ISSUE_TEMPLATE/dependency.md b/.github/ISSUE_TEMPLATE/dependency.md index 7672ec1d..4abac482 100644 --- a/.github/ISSUE_TEMPLATE/dependency.md +++ b/.github/ISSUE_TEMPLATE/dependency.md @@ -20,5 +20,4 @@ For Gradle itself: 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 --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/buildscript-gradle.lockfile b/build-conventions/buildscript-gradle.lockfile index 02326a75..528ab3a9 100644 --- a/build-conventions/buildscript-gradle.lockfile +++ b/build-conventions/buildscript-gradle.lockfile @@ -1,47 +1,37 @@ # 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. -com.github.gundy:semver4j:0.16.4=classpath -com.google.code.findbugs:jsr305:3.0.2=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.4.1=classpath -org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.4.1=classpath +org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.0.6=classpath +org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.0.6=classpath org.jetbrains.intellij.deps:trove4j:1.0.20200330=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.kotlin:kotlin-android-extensions:1.8.10=classpath +org.jetbrains.kotlin:kotlin-annotation-processing-gradle: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.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath empty= diff --git a/gradle.properties b/gradle.properties index f4e29b08..251b4e21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ # Speed up builds. Keep these flags here for quick debugging of issues. org.gradle.caching=true +org.gradle.configuration-cache=false org.gradle.configureondemand=false org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=1024m org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..ccebba77 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 722209bc..19acfb4e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,7 @@ -#Mon Sep 19 11:01:26 CEST 2022 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip -distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b +distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..79a61d42 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,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=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac