Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.

Commit 8d3c8a2

Browse files
committed
update kotlin/groovy
1 parent ed9db55 commit 8d3c8a2

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

build.gradle

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ tasks.named('generateGrammarSource') {
4141

4242
tasks.named('compileTestGroovy') {
4343
dependsOn 'compileKotlin'
44-
classpath += files(compileKotlin.destinationDir)
45-
classpath += files(compileTestKotlin.destinationDir)
44+
classpath += files(compileKotlin.destinationDirectory)
45+
classpath += files(compileTestKotlin.destinationDirectory)
4646
}
4747

4848
kotlin {
@@ -53,7 +53,6 @@ kotlin {
5353

5454
tasks.named('compileKotlin') {
5555
dependsOn 'generateGrammarSource'
56-
5756
kotlinOptions.jvmTarget = "1.8"
5857
}
5958

@@ -73,7 +72,6 @@ dependencies {
7372
antlr (libs.antlr)
7473

7574
compileOnly libs.openapi.processor.api
76-
// implementation platform("org.jetbrains.kotlin:kotlin-bom:1.6.21")
7775

7876
implementation (libs.openapi4j)
7977
implementation (libs.swagger) {
@@ -101,7 +99,6 @@ dependencies {
10199
testImplementation (libs.spock)
102100
testImplementation (libs.logback)
103101
testImplementation (libs.jimfs)
104-
testImplementation (libs.guava)
105102

106103
testIntImplementation (libs.openapi.processor.api)
107104
testIntImplementation (libs.openapi.processor.test)
@@ -113,7 +110,6 @@ dependencies {
113110
testIntImplementation (libs.spock)
114111
testIntImplementation (libs.logback)
115112
testIntImplementation (libs.jimfs)
116-
testIntImplementation (libs.guava)
117113

118114
constraints {
119115
implementation(libs.guava) {
@@ -122,6 +118,20 @@ dependencies {
122118
implementation(libs.snakeyaml) {
123119
because("vulnerabilities in 1.31")
124120
}
121+
122+
testImplementation(libs.guava) {
123+
because("avoid the android version")
124+
}
125+
testImplementation(libs.snakeyaml) {
126+
because("vulnerabilities in 1.31")
127+
}
128+
129+
testIntImplementation(libs.guava) {
130+
because("avoid the android version")
131+
}
132+
testIntImplementation(libs.snakeyaml) {
133+
because("vulnerabilities in 1.31")
134+
}
125135
}
126136
}
127137

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
2-
kotlin = "1.6.21"
2+
kotlin = "1.7.20"
33
build-jdk = "11"
4-
target-jvm = "8"
4+
target-jdk = "8"
55

66
junit = "5.9.1"
77
jacoco = "0.8.7"
@@ -41,8 +41,8 @@ kotest-runner = { module = "io.kotest:kotest-runner-junit5" }
4141
kotest-datatest = { module = "io.kotest:kotest-framework-datatest" }
4242
mockk = "io.mockk:mockk:1.13.2"
4343

44-
groovy-bom = "org.codehaus.groovy:groovy-bom:3.0.13"
45-
spock = "org.spockframework:spock-core:2.2-groovy-3.0"
44+
groovy-bom = "org.apache.groovy:groovy-bom:4.0.5"
45+
spock = "org.spockframework:spock-core:2.2-groovy-4.0"
4646

4747
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
4848
plugin-checker = "org.checkerframework:checkerframework-gradle-plugin:0.6.16"

0 commit comments

Comments
 (0)