Skip to content

Commit 9dbfba7

Browse files
committed
Spring Boot 3.0: 1.5.1 --> 1.6.0 version of plugin
1 parent 2c48609 commit 9dbfba7

File tree

11 files changed

+290
-219
lines changed

11 files changed

+290
-219
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ Gradle Groovy DSL
2727
```groovy
2828
plugins {
2929
id "org.springframework.boot" version "2.7.0"
30-
id "org.springdoc.openapi-gradle-plugin" version "1.5.0"
30+
id "org.springdoc.openapi-gradle-plugin" version "1.6.0"
3131
}
3232
```
3333

3434
Gradle Kotlin DSL
3535
```groovy
3636
plugins {
3737
id("org.springframework.boot") version "2.7.0"
38-
id("org.springdoc.openapi-gradle-plugin") version "1.5.0"
38+
id("org.springdoc.openapi-gradle-plugin") version "1.6.0"
3939
}
4040
```
4141

@@ -133,7 +133,7 @@ The `groupedApiMappings` customization allows you to specify multiple URLs/file
133133
2. Update the version for the plugin to match the current version found in `build.gradle.kts`
134134

135135
```
136-
id("org.springdoc.openapi-gradle-plugin") version "1.5.0"
136+
id("org.springdoc.openapi-gradle-plugin") version "1.6.0"
137137
```
138138
139139
3. Add the following to the spring boot apps `settings.gradle`

build.gradle.kts

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
plugins {
22
`java-gradle-plugin`
3-
id("com.gradle.plugin-publish") version "0.14.0"
4-
id("org.sonarqube") version "3.1.1"
5-
kotlin("jvm") version "1.4.31"
63
`maven-publish`
7-
id("com.github.ben-manes.versions") version "0.38.0"
8-
id("io.gitlab.arturbosch.detekt") version "1.16.0"
4+
kotlin("jvm") version "1.8.0-Beta"
5+
id ("com.palantir.idea-test-fix") version "0.1.0"
6+
id("com.gradle.plugin-publish") version "0.14.0"
7+
id("org.sonarqube") version "3.5.0.2730"
8+
id("com.github.ben-manes.versions") version "0.44.0"
9+
id("io.gitlab.arturbosch.detekt") version "1.22.0"
910
}
1011

1112
group = "org.springdoc"
12-
version = "1.5.0"
13+
version = "1.6.0"
1314

1415
sonarqube {
1516
properties {
@@ -45,20 +46,19 @@ publishing {
4546
}
4647

4748
dependencies {
48-
implementation(kotlin("reflect"))
49-
implementation("com.google.code.gson:gson:2.8.6")
50-
implementation("org.awaitility:awaitility-kotlin:4.0.3")
51-
implementation("com.github.psxpaul:gradle-execfork-plugin:0.2.0")
52-
implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.6")
49+
implementation("com.google.code.gson:gson:2.10")
50+
implementation("org.awaitility:awaitility-kotlin:4.2.0")
51+
implementation("com.github.psxpaul:gradle-execfork-plugin:0.2.1")
52+
implementation("org.springframework.boot:spring-boot-gradle-plugin:2.7.6")
53+
implementation("jakarta.platform:jakarta.jakartaee-api:10.0.0")
5354

5455
testImplementation(gradleTestKit())
55-
testImplementation(platform("org.junit:junit-bom:5.7.1"))
56-
testImplementation("org.junit.jupiter:junit-jupiter")
57-
testImplementation("com.beust:klaxon:5.5")
58-
testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2")
59-
testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2")
56+
testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
57+
testImplementation("com.beust:klaxon:5.6")
58+
testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.0")
59+
testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.0")
6060

61-
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0")
61+
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
6262
}
6363

6464
gradlePlugin {
@@ -78,23 +78,16 @@ pluginBundle {
7878
tags = listOf("springdoc", "openapi", "swagger")
7979
}
8080

81-
val jvmVersion: JavaLanguageVersion = JavaLanguageVersion.of(8)
82-
83-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
84-
kotlinOptions {
85-
jvmTarget = "1.${jvmVersion.toString()}"
86-
}
87-
}
8881

89-
tasks.withType<Test>().configureEach {
90-
useJUnitPlatform()
91-
maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
82+
tasks{
83+
val java: String by project
84+
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach { kotlinOptions { jvmTarget = java } }
85+
withType<io.gitlab.arturbosch.detekt.Detekt> { jvmTarget = java }
86+
withType<Test>().configureEach { useJUnitPlatform() }
87+
withType<Jar> { duplicatesStrategy = DuplicatesStrategy.EXCLUDE }
9288
}
9389

9490
detekt {
9591
config = files("config/detekt/detekt.yml")
9692
parallel = true
9793
}
98-
tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
99-
jvmTarget = "1.${jvmVersion.toString()}"
100-
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
java=17
12
kotlin.code.style=official
23
org.gradle.caching=true
34
org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.jar

2.32 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)