fix(deps): update dependency com.charleskorn.kaml:kaml to v0.74.0 (#715)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/pr_checks.yml

@@ -11,7 +11,7 @@ jobs:
           distribution: 'adopt'
           java-version: '21'
       - name: Lint
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v2
         with:
           gradle-version: wrapper
           arguments: detekt
@@ -25,7 +25,7 @@ jobs:
           distribution: 'adopt'
           java-version: '21'
       - name: Unit Tests
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v2
         with:
           gradle-version: wrapper
           arguments: test koverHtmlReport

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
           distribution: 'adopt'
           java-version: '21'
       - name: Publish to Maven Central
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v2
         with:
           gradle-version: wrapper
           arguments: publishAndReleaseToMavenCentral --no-configuration-cache --stacktrace

build.gradle.kts

@@ -3,13 +3,13 @@ import io.bkbn.sourdough.gradle.library.jvm.LibraryJvmPlugin
 import io.bkbn.sourdough.gradle.library.jvm.LibraryJvmExtension
 
 plugins {
-  kotlin("jvm") version "2.0.21" apply false
+  kotlin("jvm") version "2.1.20" apply false
-  kotlin("plugin.serialization") version "2.0.21" apply false
+  kotlin("plugin.serialization") version "2.1.20" apply false
   id("io.bkbn.sourdough.library.jvm") version "0.13.1" apply false
   id("io.bkbn.sourdough.application.jvm") version "0.13.1" apply false
-  id("com.vanniktech.maven.publish") version "0.30.0" apply false
+  id("com.vanniktech.maven.publish") version "0.31.0" apply false
   id("io.bkbn.sourdough.root") version "0.13.1"
-  id("org.jetbrains.kotlinx.kover") version "0.8.3"
+  id("org.jetbrains.kotlinx.kover") version "0.9.1"
 }
 
 dependencies {

core/src/test/kotlin/io/bkbn/kompendium/core/util/Enrichment.kt

@@ -10,6 +10,7 @@ import io.bkbn.kompendium.core.fixtures.TestSimpleRequest
 import io.bkbn.kompendium.core.metadata.GetInfo
 import io.bkbn.kompendium.core.metadata.PostInfo
 import io.bkbn.kompendium.core.plugin.NotarizedRoute
+import io.bkbn.kompendium.enrichment.BooleanEnrichment
 import io.bkbn.kompendium.enrichment.CollectionEnrichment
 import io.bkbn.kompendium.enrichment.MapEnrichment
 import io.bkbn.kompendium.enrichment.NumberEnrichment
@@ -63,6 +64,9 @@ fun Route.enrichedSimpleRequest() {
                   deprecated = true
                 }
               }
+              TestSimpleRequest::c {
+                BooleanEnrichment("blah-blah-blah") { }
+              }
             }
           )
           description("A test request")

core/src/test/resources/T0002__notarized_post.json

@@ -109,11 +109,15 @@
           "b": {
             "type": "number",
             "format": "int32"
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       }
     },

core/src/test/resources/T0003__notarized_put.json

@@ -109,11 +109,15 @@
           "b": {
             "type": "number",
             "format": "int32"
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       }
     },

core/src/test/resources/T0005__notarized_patch.json

@@ -109,11 +109,15 @@
           "b": {
             "type": "number",
             "format": "int32"
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       }
     },

core/src/test/resources/T0053__same_path_different_methods_and_auth.json

@@ -144,11 +144,15 @@
           "b": {
             "type": "number",
             "format": "int32"
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       }
     },

core/src/test/resources/T0055__enriched_simple_request.json

@@ -111,11 +111,15 @@
             "type": "number",
             "format": "int32",
             "deprecated": true
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       }
     },

core/src/test/resources/T0067__enriched_generic_object.json

@@ -76,11 +76,15 @@
             "type": "number",
             "format": "int32",
             "deprecated": true
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       }
     },

core/src/test/resources/T0077__enriched_top_level_list.json

@@ -111,11 +111,15 @@
             "type": "number",
             "format": "int32",
             "deprecated": true
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       },
       "TestSimpleRequest-blah-blah": {
@@ -129,11 +133,15 @@
             "type": "number",
             "format": "int32",
             "deprecated": true
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       },
       "List-TestSimpleRequest-blah-blah": {

core/src/test/resources/T0078__enriched_top_level_map.json

@@ -64,11 +64,15 @@
             "type": "number",
             "format": "int32",
             "deprecated": true
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       },
       "TestSimpleRequest-blah": {
@@ -82,11 +86,15 @@
             "type": "number",
             "format": "int32",
             "deprecated": true
+          },
+          "c": {
+            "type": "boolean"
           }
         },
         "required": [
           "a",
-          "b"
+          "b",
+          "c"
         ]
       },
       "Map-String-TestSimpleRequest-blah": {

core/src/testFixtures/kotlin/io/bkbn/kompendium/core/fixtures/TestModels.kt

@@ -23,7 +23,8 @@ data class TestRequest(
 @Serializable
 data class TestSimpleRequest(
   val a: String,
-  val b: Int
+  val b: Int,
+  val c: Boolean
 )
 
 @Serializable

gradle.properties

@@ -1,5 +1,5 @@
 # Kompendium
-project.version=4.0.1
+project.version=4.0.3
 
 # Kotlin
 kotlin.code.style=official
@@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx2000m
 org.gradle.parallel=true
 
 # Dependencies
-kotlinVersion=2.0.21
+kotlinVersion=2.1.20
-kotlinSerializeVersion=1.7.3
+kotlinSerializeVersion=1.8.0
-ktorVersion=3.0.1
+ktorVersion=3.1.2
-kotestVersion=6.0.0.M1
+kotestVersion=6.0.0.M3
-detektVersion=1.23.7
+detektVersion=1.23.8

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 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,
+#   * DEFAULT_JVM_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.

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 

json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/EnrichmentHandler.kt

@@ -1,5 +1,6 @@
 package io.bkbn.kompendium.json.schema.handler
 
+import io.bkbn.kompendium.enrichment.BooleanEnrichment
 import io.bkbn.kompendium.enrichment.CollectionEnrichment
 import io.bkbn.kompendium.enrichment.Enrichment
 import io.bkbn.kompendium.enrichment.MapEnrichment
@@ -15,6 +16,7 @@ import io.bkbn.kompendium.json.schema.definition.TypeDefinition
 object EnrichmentHandler {
 
   fun Enrichment.applyToSchema(schema: JsonSchema): JsonSchema = when (this) {
+    is BooleanEnrichment -> applyToSchema(schema)
     is NumberEnrichment -> applyToSchema(schema)
     is StringEnrichment -> applyToSchema(schema)
     is CollectionEnrichment<*> -> applyToSchema(schema)
@@ -39,6 +41,11 @@ object EnrichmentHandler {
     else -> error("Incorrect enrichment type for enrichment id: ${this.id}")
   }
 
+  private fun BooleanEnrichment.applyToSchema(schema: JsonSchema): JsonSchema = when (schema) {
+    is TypeDefinition -> schema.copyBooleanEnrichment(this)
+    else -> error("Incorrect enrichment type for enrichment id: ${this.id}")
+  }
+
   private fun NumberEnrichment.applyToSchema(schema: JsonSchema): JsonSchema = when (schema) {
     is TypeDefinition -> schema.copyNumberEnrichment(this)
     else -> error("Incorrect enrichment type for enrichment id: ${this.id}")
@@ -49,6 +56,13 @@ object EnrichmentHandler {
     else -> error("Incorrect enrichment type for enrichment id: ${this.id}")
   }
 
+  private fun TypeDefinition.copyBooleanEnrichment(
+    enrichment: BooleanEnrichment
+  ): TypeDefinition = copy(
+    deprecated = enrichment.deprecated,
+    description = enrichment.description,
+  )
+
   private fun TypeDefinition.copyNumberEnrichment(
     enrichment: NumberEnrichment
   ): TypeDefinition = copy(

json-schema/src/test/resources/T0004__simple_object.json

@@ -7,10 +7,14 @@
     "b": {
       "type": "number",
       "format": "int32"
+    },
+    "c": {
+      "type": "boolean"
     }
   },
   "required": [
     "a",
-    "b"
+    "b",
+    "c"
   ]
 }

json-schema/src/test/resources/T0006__nullable_object.json

@@ -7,10 +7,14 @@
     "b": {
       "type": "number",
       "format": "int32"
+    },
+    "c": {
+      "type": "boolean"
     }
   },
   "required": [
     "a",
-    "b"
+    "b",
+    "c"
   ]
 }

json-schema/src/test/resources/T0022__enriched_simple_object.json

@@ -9,10 +9,14 @@
       "type": "number",
       "format": "int32",
       "deprecated": true
+    },
+    "c": {
+      "type": "boolean"
     }
   },
   "required": [
     "a",
-    "b"
+    "b",
+    "c"
   ]
 }

playground/build.gradle.kts

@@ -34,16 +34,16 @@ dependencies {
 
   // Logging
   implementation("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
-  implementation("org.apache.logging.log4j:log4j-api:2.24.1")
+  implementation("org.apache.logging.log4j:log4j-api:2.24.3")
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+  implementation("org.apache.logging.log4j:log4j-core:2.24.3")
-  implementation("org.slf4j:slf4j-api:2.0.16")
+  implementation("org.slf4j:slf4j-api:2.0.17")
-  implementation("org.slf4j:slf4j-simple:2.0.16")
+  implementation("org.slf4j:slf4j-simple:2.0.17")
 
   // YAML
-  implementation("com.charleskorn.kaml:kaml:0.62.1")
+  implementation("com.charleskorn.kaml:kaml:0.74.0")
 
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializeVersion")
-  implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
+  implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
 
-  implementation("joda-time:joda-time:2.13.0")
+  implementation("joda-time:joda-time:2.14.0")
 }

protobuf-java-converter/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
   val kotlinSerializeVersion: String by project
 
   implementation(projects.kompendiumJsonSchema)
-  implementation("com.google.protobuf:protobuf-java:3.25.5")
+  implementation("com.google.protobuf:protobuf-java:3.25.6")
   implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializeVersion")
 

resources/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
   id("io.bkbn.sourdough.library.jvm")
   id("io.gitlab.arturbosch.detekt")
   id("com.adarshr.test-logger")
+  id("com.vanniktech.maven.publish")
   id("java-library")
   id("signing")
   id("org.jetbrains.kotlinx.kover")