Merge branch 'main' into infra/ci-code-suggest

Author: petertrr

.github/workflows/build_and_test.yml

@@ -14,7 +14,7 @@ jobs:
  CI: true
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Set up JDK 11
  uses: actions/setup-java@v3
  with:
@@ -25,6 +25,7 @@ jobs:
  with:
  arguments: check build -x detekt -Pdetekt.multiplatform.disabled=true --scan
  gradle-version: wrapper
+ dependency-graph: generate-and-submit
  - name: Upload test reports
  if: ${{ failure() }} # runs only if previous step has failed, the entire workflow will still be marked as failed
  uses: actions/upload-artifact@v3

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
  runs-on: ubuntu-22.04
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Set up JDK 11
  uses: actions/setup-java@v3
  with:
@@ -41,7 +41,7 @@ jobs:
  runs-on: macos-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Set up JDK 11
  uses: actions/setup-java@v3
  with:
@@ -56,7 +56,7 @@ jobs:
  runs-on: windows-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Set up JDK 11
  uses: actions/setup-java@v3
  with:

build.gradle.kts

@@ -54,7 +54,7 @@ tasks.withType<KotlinJvmTest> {
 
 detekt {
  buildUponDefaultConfig = true
- config = files("detekt.yml")
+ config.setFrom(files("detekt.yml"))
  autoCorrect = (findProperty("detektAutoCorrect") as String?)?.toBoolean() ?: true
 }
 dependencies {

buildSrc/src/main/kotlin/io/github/petertrr/jacoco-convention.gradle.kts

@@ -29,7 +29,7 @@ val jvmTestTask by tasks.named<Test>("jvmTest") {
 val jacocoTestReportTask by tasks.register<JacocoReport>("jacocoTestReport") {
  executionData(jvmTestTask.extensions.getByType(JacocoTaskExtension::class.java).destinationFile)
  additionalSourceDirs(kotlin.sourceSets["commonMain"].kotlin.sourceDirectories)
- classDirectories.setFrom(file("$buildDir/classes/kotlin/jvm/main"))
+ classDirectories.setFrom(layout.buildDirectory.file("classes/kotlin/jvm/main"))
  reports {
  xml.required.set(true)
  html.required.set(true)

detekt.yml

@@ -6,4 +6,6 @@ style:
 formatting:
  active: true
  MaximumLineLength:
+ active: false
+ ParameterListWrapping:
  active: false

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 kotlin = "1.8.21"
-junit = "5.9.3"
-detekt = "1.23.0"
+junit = "5.10.0"
+detekt = "1.23.1"
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -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
@@ -144,15 +145,15 @@ 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
  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
+ # shellcheck disable=SC2039,SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -201,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" \

gradlew

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
- id("com.gradle.enterprise") version("3.13.4")
+ id("com.gradle.enterprise") version("3.15.1")
  id("org.ajoberstar.reckon.settings") version("0.18.0")
 }