Merge branch 'main' into chore/bump-juice-v7

# Conflicts:
#	prop-all/src/test/kotlin/io/pleo/prop/objects/BothNamedAnnotations.kt

.github/templates.yaml

@@ -1,15 +1,13 @@
 version: v32.0.1
 
 files:
-  - .github/.kodiak.toml
-  - .github/workflows/format-kotlin.yaml
-  - .github/workflows/release.yaml
-  - .github/workflows/verify-release.yaml
   - .autorc.json
-  - .github/workflows/pr-help.yaml
-  - .github/workflows/assign-random-codeowner.yaml
+  - .github/.kodiak.toml
   - .github/workflows/build-and-test.yaml
   - .github/workflows/codeql-analysis.yaml
+  - .github/workflows/pr-help.yaml
+  - .github/workflows/release.yaml
+  - .github/workflows/verify-release.yaml
 
 values:
   autoRelease: true

.github/workflows/build-and-test.yaml

@@ -128,24 +128,6 @@ jobs:
           check_name: Unit Tests report
           report_paths: "**/build/test-results/test/TEST-*.xml"
 
-      # Run Detekt
-      - name: Run Detekt
-        continue-on-error: true
-        if: ${{ github.ref == 'refs/heads/main' }}
-        run: ./gradlew detekt --stacktrace
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_REGISTRY_GRADLE_TOKEN }}
-          GRADLE_READ_KEY: ${{ secrets.GH_REGISTRY_GRADLE_TOKEN }}
-          JOB_RUNR_REPO_PASSWORD: ${{ secrets.JOB_RUNR_REPO_PASSWORD }}
-
-      # Publish Detekt results to GitHub.
-      - name: Publish Detekt SARIF report to GitHub
-        continue-on-error: true
-        if: ${{ github.ref == 'refs/heads/main' }}
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: build/reports/detekt/detekt.sarif
-
       - name: Trigger release
         if: ${{ github.ref == 'refs/heads/main' }}
         uses: peter-evans/repository-dispatch@v2

build.gradle

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     repositories {
@@ -22,13 +23,15 @@ plugins {
     id 'jacoco'
     alias(libs.plugins.coveralls.jacoco) apply false
     alias(libs.plugins.jacocolog) apply false
+    alias(libs.plugins.jmailen.kotlinter) apply false
 }
 
 allprojects {
     group = 'io.pleo'
 
     apply plugin: libs.plugins.coveralls.jacoco.get().pluginId
     apply plugin: libs.plugins.jacocolog.get().pluginId
+    apply plugin: libs.plugins.jmailen.kotlinter.get().pluginId
 
     jacoco {
         toolVersion = "0.8.7"
@@ -52,11 +55,11 @@ subprojects {
     sourceCompatibility = 17
     targetCompatibility = 17
 
-    tasks.withType(JavaCompile) {
+    tasks.withType(JavaCompile).configureEach {
         options.encoding = 'UTF-8'
     }
 
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    tasks.withType(KotlinCompile).configureEach {
         kotlinOptions {
             jvmTarget = "17"
             javaParameters = true
@@ -77,14 +80,18 @@ subprojects {
         testRuntimeOnly(libs.junit.jupiter.engine)
     }
 
-    task sourcesJar(type: Jar) {
+    tasks.register('sourcesJar', Jar) {
         from sourceSets.main.allJava
-        classifier = 'sources'
+        archiveClassifier = 'sources'
     }
 
-    task javadocJar(type: Jar) {
+    tasks.register('javadocJar', Jar) {
         from javadoc
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
+    }
+
+    tasks.named('check') {
+        finalizedBy 'formatKotlin'
     }
 
     javadoc {
@@ -184,3 +191,7 @@ coverallsJacoco {
 tasks.named('coverallsJacoco') {
     dependsOn jacocoAggregatedReport
 }
+
+//tasks.named('check') {
+//    dependsOn 'installKotlinterPrePushHook'
+//}

gradle.properties

@@ -1,2 +1,6 @@
-#Thu Feb 02 09:01:06 UTC 2023
+#Some properties were automatically set by the Pleo Gradle plugin.
+#Thu Dec 21 10:26:54 EET 2023
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.problems=warn
+org.gradle.jvmargs=-Xmx4096m "-XX\:MaxMetaspaceSize\=1024m"
 version=6.0.28

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ jacksonVersion = "2.14.2"
 junitVersion = "5.9.3"
 kotlinGuiceVersion = "3.0.0"
 kotlinVersion = "1.8.0"
-kotlinterGradleVersion = "3.13.0"
+kotlinterGradleVersion = "3.16.0"
 logbackClassicVersion = "1.4.5"
 mockkVersion = "1.13.4"
 monetaVersion = "1.4.2"
@@ -36,10 +36,9 @@ slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4jVersion" }
 
 [plugins]
 java-library = { id = "java-library" }
-jmailen-kotlinter = { id = "org.jmailen.kotlinter" }
+jmailen-kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinterGradleVersion" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinVersion" }
 kotlin-library = { id = "kotlin" }
 maven-publish = { id = "maven-publish" }
 coveralls-jacoco = { id = "com.github.nbaztec.coveralls-jacoco", version = "1.2.15" }
 jacocolog = { id = "org.barfuin.gradle.jacocolog", version = "3.0.0" }
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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,13 +80,11 @@ 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##*/}
-
-# 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"'
+# 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
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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=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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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.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%