Merge branch 'develop' into release

SMILEY4 · Mar 15, 2024 · dbab8bf · dbab8bf
2 parents 6642003 + 6699f97
commit dbab8bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ import io.gitlab.arturbosch.detekt.Detekt
 object Meta {
     const val groupId = "io.github.smiley4"
     const val artifactId = "ktor-swagger-ui"
-    const val version = "2.7.4"
+    const val version = "2.8.0"
     const val name = "Ktor Swagger-UI"
     const val description = "Ktor plugin to document routes and provide Swagger UI"
     const val licenseName = "The Apache License, Version 2.0"
@@ -51,7 +51,7 @@ dependencies {
     val swaggerParserVersion = "2.1.19"
     implementation("io.swagger.parser.v3:swagger-parser:$swaggerParserVersion")
 
-    val jsonSchemaGeneratorVersion = "4.32.0"
+    val jsonSchemaGeneratorVersion = "4.33.1"
     implementation("com.github.victools:jsonschema-generator:$jsonSchemaGeneratorVersion")
     implementation("com.github.victools:jsonschema-module-jackson:$jsonSchemaGeneratorVersion")
     implementation("com.github.victools:jsonschema-module-swagger-2:$jsonSchemaGeneratorVersion")

diff --git a/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/EncodingData.kt b/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/EncodingData.kt
@@ -87,6 +87,7 @@ data class EncodingData(
                 .with(Option.ALLOF_CLEANUP_AT_THE_END)
                 .with(Option.MAP_VALUES_AS_ADDITIONAL_PROPERTIES)
                 .with(Option.DEFINITIONS_FOR_ALL_OBJECTS)
+                .with(Option.INLINE_NULLABLE_SCHEMAS)
                 .without(Option.INLINE_ALL_SCHEMAS)
                 .also {
                     it.forTypesInGeneral()