File tree Expand file tree Collapse file tree 7 files changed +13
-14
lines changed
restdocs-api-spec-gradle-plugin
restdocs-api-spec-jsonschema
src/main/kotlin/com/epages/restdocs/apispec/jsonschema
restdocs-api-spec-openapi3-generator
restdocs-api-spec-postman-generator Expand file tree Collapse file tree 7 files changed +13
-14
lines changed Original file line number Diff line number Diff line change 11
2+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
34import org.jmailen.gradle.kotlinter.tasks.LintTask
45import pl.allegro.tech.build.axion.release.domain.TagNameSerializationConfig
@@ -69,7 +70,7 @@ subprojects {
6970 val disabledKtlintRules by extra { arrayOf(" max-line-length" ) }
7071
7172 tasks.withType<KotlinCompile > {
72- kotlinOptions .jvmTarget = " 21 "
73+ compilerOptions .jvmTarget.set( JvmTarget . JVM_21 )
7374 }
7475
7576 tasks.withType<Test > {
Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ dependencies {
6060 testImplementation(" org.junit-pioneer:junit-pioneer:2.3.0" )
6161 testImplementation(" org.assertj:assertj-core:3.27.6" )
6262
63- testImplementation(" com.jayway.jsonpath:json-path:2.9 .0" )
63+ testImplementation(" com.jayway.jsonpath:json-path:2.10 .0" )
6464
6565 testImplementation(gradleTestKit())
6666
Original file line number Diff line number Diff line change @@ -22,8 +22,8 @@ dependencies {
2222
2323 testImplementation(" org.junit.jupiter:junit-jupiter-engine:$junitVersion " )
2424 testRuntimeOnly(" org.junit.platform:junit-platform-launcher" )
25- testImplementation(" com.github.java-json-tools:json-schema-validator:2.2.10 " )
26- testImplementation(" com.jayway.jsonpath:json-path:2.9 .0" )
25+ testImplementation(" com.github.java-json-tools:json-schema-validator:2.2.14 " )
26+ testImplementation(" com.jayway.jsonpath:json-path:2.10 .0" )
2727 testImplementation(" org.assertj:assertj-core:3.27.6" )
2828 testImplementation(" javax.validation:validation-api:2.0.1.Final" )
2929}
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ class JsonSchemaFromFieldDescriptorsGenerator {
6161 ? : groups
6262 .firstOrNull { it.path == fieldDescriptor.path }
6363 ?.let { groups - it + it.merge(fieldDescriptor) } // merge the type with the descriptor with the same name
64- ? : groups + fieldDescriptor // it is new just add it
64+ ? : ( groups + fieldDescriptor) // it is new just add it
6565 }
6666
6767 private fun unWrapRootArray (
@@ -103,7 +103,7 @@ class JsonSchemaFromFieldDescriptorsGenerator {
103103 builder : ObjectSchema .Builder ,
104104 ): Schema {
105105 val groupedFields = groupFieldsByFirstRemainingPathSegment(traversedSegments, jsonFieldPaths)
106- groupedFields.forEach { propertyName, fieldList ->
106+ groupedFields.forEach { ( propertyName, fieldList) ->
107107
108108 val newTraversedSegments = (traversedSegments + propertyName).toMutableList()
109109 fieldList
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ dependencies {
2626 testRuntimeOnly(" org.junit.platform:junit-platform-launcher" )
2727 testImplementation(" org.assertj:assertj-core:3.27.6" )
2828
29- testImplementation(" com.jayway.jsonpath:json-path:2.9 .0" )
29+ testImplementation(" com.jayway.jsonpath:json-path:2.10 .0" )
3030}
3131
3232publishing {
Original file line number Diff line number Diff line change @@ -21,8 +21,8 @@ dependencies {
2121 testImplementation(" org.junit.jupiter:junit-jupiter-engine:$junitVersion " )
2222 testRuntimeOnly(" org.junit.platform:junit-platform-launcher" )
2323 testImplementation(" org.assertj:assertj-core:3.27.6" )
24- testImplementation(" com.jayway.jsonpath:json-path:2.9 .0" )
25- testImplementation(" com.github.java-json-tools:json-schema-validator:2.2.10 " )
24+ testImplementation(" com.jayway.jsonpath:json-path:2.10 .0" )
25+ testImplementation(" com.github.java-json-tools:json-schema-validator:2.2.14 " )
2626}
2727
2828publishing {
Original file line number Diff line number Diff line change @@ -24,18 +24,16 @@ dependencies {
2424 implementation(" com.fasterxml.jackson.core:jackson-databind:$jacksonVersion " )
2525 implementation(" com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion " )
2626
27- testImplementation(" org.springframework.boot:spring-boot-starter-test:$springBootVersion " ) {
28- exclude(" junit" )
29- }
27+ testImplementation(" org.springframework.boot:spring-boot-starter-test:$springBootVersion " )
3028 testImplementation(" org.junit.jupiter:junit-jupiter-engine:$junitVersion " )
3129 testRuntimeOnly(" org.junit.platform:junit-platform-launcher" )
3230 testImplementation(" org.junit-pioneer:junit-pioneer:2.3.0" )
3331 testImplementation(" org.springframework.boot:spring-boot-starter-hateoas:$springBootVersion " )
3432 testImplementation(" org.hibernate.validator:hibernate-validator:6.0.10.Final" )
3533 testImplementation(" org.assertj:assertj-core:3.27.6" )
36- testImplementation(" com.jayway.jsonpath:json-path:2.3 .0" )
34+ testImplementation(" com.jayway.jsonpath:json-path:2.10 .0" )
3735
38- testImplementation(" com.github.java-json-tools:json-schema-validator:2.2.10 " )
36+ testImplementation(" com.github.java-json-tools:json-schema-validator:2.2.14 " )
3937 testImplementation(" com.github.erosb:everit-json-schema:1.11.0" )
4038}
4139
You can’t perform that action at this time.
0 commit comments