Skip to content

Commit 4dd5935

Browse files
committed
Fixed some Java 21 settings and compilation issues
Imports cleanup
1 parent 6604a61 commit 4dd5935

File tree

34 files changed

+2326
-2038
lines changed

34 files changed

+2326
-2038
lines changed

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ subprojects {
6767
val springBootVersion by extra { "3.5.7" }
6868
val springRestDocsVersion by extra { "3.0.5" }
6969
val junitVersion by extra { "5.12.2" }
70-
val disabledKtlintRules by extra { arrayOf("max-line-length") }
7170

7271
tasks.withType<KotlinCompile> {
7372
compilerOptions.jvmTarget.set(JvmTarget.JVM_21)

restdocs-api-spec-gradle-plugin/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ pluginBundle {
3939

4040
val jacksonVersion: String by extra
4141
val junitVersion: String by extra
42-
val disabledKtlintRules: Array<String> by extra
4342

4443
val jacocoRuntime by configurations.creating
4544

@@ -103,7 +102,3 @@ val configureGradlePluginCredentials by tasks.registering {
103102
}
104103

105104
tasks["publishPlugins"].dependsOn(configureGradlePluginCredentials)
106-
107-
kotlinter {
108-
disabledRules = disabledKtlintRules
109-
}

restdocs-api-spec-gradle-plugin/src/test/kotlin/com/epages/restdocs/apispec/gradle/ApiSpecTaskTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.junit.jupiter.api.io.TempDir
1212
import java.io.File
1313
import java.nio.file.Files
1414
import java.nio.file.Path
15-
import kotlin.streams.toList
1615

1716
abstract class ApiSpecTaskTest {
1817
lateinit var snippetsFolder: File

restdocs-api-spec-gradle-plugin/src/test/kotlin/com/epages/restdocs/apispec/gradle/RestdocsOpenApi3TaskTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.epages.restdocs.apispec.gradle
33
import com.jayway.jsonpath.JsonPath
44
import org.assertj.core.api.BDDAssertions.then
55
import org.junit.jupiter.api.Test
6-
import org.junit.jupiter.api.extension.ExtendWith
76
import java.lang.Boolean.FALSE
87

98
class RestdocsOpenApi3TaskTest : RestdocsOpenApiTaskTestBase() {

restdocs-api-spec-gradle-plugin/src/test/kotlin/com/epages/restdocs/apispec/gradle/RestdocsOpenApiTaskTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.epages.restdocs.apispec.gradle
22

33
import com.jayway.jsonpath.JsonPath
44
import org.assertj.core.api.BDDAssertions.then
5-
import org.junit.jupiter.api.extension.ExtendWith
65

76
class RestdocsOpenApiTaskTest : RestdocsOpenApiTaskTestBase() {
87
override val taskName = "openapi"

restdocs-api-spec-jsonschema/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2-
31
plugins {
42
kotlin("jvm")
53
signing
@@ -11,7 +9,6 @@ repositories {
119

1210
val jacksonVersion: String by extra
1311
val junitVersion: String by extra
14-
val disabledKtlintRules: Array<String> by extra
1512

1613
dependencies {
1714
implementation(kotlin("stdlib-jdk8"))
@@ -68,7 +65,3 @@ java {
6865
withJavadocJar()
6966
withSourcesJar()
7067
}
71-
72-
kotlinter {
73-
disabledRules = disabledKtlintRules
74-
}

restdocs-api-spec-jsonschema/src/main/kotlin/com/epages/restdocs/apispec/jsonschema/JsonFieldPath.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.epages.restdocs.apispec.jsonschema
22

3-
import java.util.ArrayList
43
import java.util.regex.Pattern
54

65
internal class JsonFieldPath private constructor(

restdocs-api-spec-jsonschema/src/main/kotlin/com/epages/restdocs/apispec/jsonschema/JsonSchemaFromFieldDescriptorsGenerator.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import org.everit.json.schema.Schema
2525
import org.everit.json.schema.StringSchema
2626
import org.everit.json.schema.internal.JSONPrinter
2727
import java.io.StringWriter
28-
import java.util.ArrayList
2928
import java.util.Collections.emptyList
3029
import java.util.function.Predicate
3130

restdocs-api-spec-mockmvc/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ repositories {
1010
val springBootVersion: String by extra
1111
val springRestDocsVersion: String by extra
1212
val junitVersion: String by extra
13-
val disabledKtlintRules: Array<String> by extra
1413

1514
dependencies {
1615
implementation(kotlin("stdlib-jdk8"))
@@ -68,7 +67,3 @@ java {
6867
withJavadocJar()
6968
withSourcesJar()
7069
}
71-
72-
kotlinter {
73-
disabledRules = disabledKtlintRules
74-
}

restdocs-api-spec-model/build.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2-
31
val jacksonVersion: String by extra
42

53
plugins {
@@ -11,8 +9,6 @@ repositories {
119
mavenCentral()
1210
}
1311

14-
val disabledKtlintRules: Array<String> by extra
15-
1612
dependencies {
1713
implementation(kotlin("stdlib-jdk8"))
1814
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
@@ -58,7 +54,3 @@ java {
5854
withJavadocJar()
5955
withSourcesJar()
6056
}
61-
62-
kotlinter {
63-
disabledRules = disabledKtlintRules
64-
}

0 commit comments

Comments
 (0)