From 11addbb9f00684d3723fab0369f22bb848c92b41 Mon Sep 17 00:00:00 2001 From: Lukas Ruegner Date: Fri, 5 Jan 2024 17:48:26 +0100 Subject: [PATCH 1/3] bump version to 2.8.0 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index cb4059f..bfd77ca 100644 --- 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.3" + 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" From 7a4971e6cf3299c6e8f2485959ebfc55d0a31f34 Mon Sep 17 00:00:00 2001 From: Lukas Ruegner Date: Fri, 5 Jan 2024 18:24:17 +0100 Subject: [PATCH 2/3] increase gh-action publish timeout --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3e36806..5f3d55d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,6 +31,8 @@ jobs: ./gradlew publishAllPublicationsToMavenCentral --no-configuration-cache ./gradlew closeAndReleaseRepository env: + SONATYPE_CONNECT_TIMEOUT_SECONDS: 180 + SONATYPE_CLOSE_TIMEOUT_SECONDS: 900 ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_SECRET_KEY }} From c1b953f266d8767964e00605b49a56a1aa60d661 Mon Sep 17 00:00:00 2001 From: Branislav Malinovsky Date: Tue, 12 Mar 2024 12:57:15 +0100 Subject: [PATCH 3/3] feat: bump victools to 4.33.1 and inline nullable schemas by default --- build.gradle.kts | 2 +- .../kotlin/io/github/smiley4/ktorswaggerui/data/EncodingData.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index bfd77ca..99da250 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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 index 111c618..dcfa716 100644 --- 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()