Merge branch '6.1.x'
This commit is contained in:
commit
ea2895f7c7
|
@ -19,7 +19,7 @@ dependencies {
|
||||||
api(platform("org.eclipse.jetty:jetty-bom:12.0.11"))
|
api(platform("org.eclipse.jetty:jetty-bom:12.0.11"))
|
||||||
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.11"))
|
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.11"))
|
||||||
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
|
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
|
||||||
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0"))
|
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
|
||||||
api(platform("org.junit:junit-bom:5.10.3"))
|
api(platform("org.junit:junit-bom:5.10.3"))
|
||||||
api(platform("org.mockito:mockito-bom:5.12.0"))
|
api(platform("org.mockito:mockito-bom:5.12.0"))
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ org.gradle.caching=true
|
||||||
org.gradle.jvmargs=-Xmx2048m
|
org.gradle.jvmargs=-Xmx2048m
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
||||||
kotlinVersion=1.9.22
|
kotlinVersion=1.9.24
|
||||||
|
|
||||||
kotlin.jvm.target.validation.mode=ignore
|
kotlin.jvm.target.validation.mode=ignore
|
||||||
kotlin.stdlib.default.dependency=false
|
kotlin.stdlib.default.dependency=false
|
||||||
|
|
Loading…
Reference in New Issue