Skip to content

Commit 825e09a

Browse files
committed
Update Kotlin from 2.0.0 to 2.0.10
1 parent c69bfcf commit 825e09a

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

gradle/libs.versions.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ksp = "2.0.10-1.0.24"
1414
# https://square.github.io/kotlinpoet/
1515
kotlinPoet = "1.18.1"
1616
# https://github.com/Kotlin/kotlinx-benchmark
17-
kotlinxBenchmark = "0.4.11"
17+
#kotlinxBenchmark = "0.4.11"
1818
reactor = "3.6.2"
1919
# simbots
2020
suspendTransform = "0.9.0"
@@ -42,15 +42,12 @@ dokka-base = { group = "org.jetbrains.dokka", name = "dokka-base", version.ref =
4242

4343
# kotlinx-coroutines
4444
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
45-
kotlinx-coroutines-jdk8 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-jdk8", version.ref = "kotlinx-coroutines" }
4645
kotlinx-coroutines-reactive = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactive", version.ref = "kotlinx-coroutines" }
4746
kotlinx-coroutines-reactor = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactor", version.ref = "kotlinx-coroutines" }
4847
kotlinx-coroutines-rx2 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-rx2", version.ref = "kotlinx-coroutines" }
4948
kotlinx-coroutines-rx3 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-rx3", version.ref = "kotlinx-coroutines" }
5049
kotlinx-coroutines-guava = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-guava", version.ref = "kotlinx-coroutines" }
51-
kotlinx-coroutines-jdk9 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-jdk9", version.ref = "kotlinx-coroutines" }
5250
kotlinx-coroutines-slf4j = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-slf4j", version.ref = "kotlinx-coroutines" }
53-
kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" }
5451
kotlinx-coroutines-debug = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-debug", version.ref = "kotlinx-coroutines" }
5552
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
5653

@@ -86,7 +83,7 @@ spring-boot-v3-dependencies = { group = "org.springframework.boot", name = "spri
8683
spring-boot-v3-autoconfigure = { group = "org.springframework.boot", name = "spring-boot-autoconfigure" } # , version.ref = "spring-boot-v3"
8784
spring-boot-v3-logging = { group = "org.springframework.boot", name = "spring-boot-starter-logging" } # , version.ref = "spring-boot-v3"
8885
spring-boot-v3-actuator = { group = "org.springframework.boot", name = "spring-boot-starter-actuator" } # , version.ref = "spring-boot-v3"
89-
spring-boot-v3-configuration-processor = { group = "org.springframework.boot", name = "spring-boot-configuration-processor", version.ref = "spring-boot-v3" } # , version.ref = "spring-boot-v3"
86+
spring-boot-v3-configuration-processor = { group = "org.springframework.boot", name = "spring-boot-configuration-processor", version.ref = "spring-boot-v3" }
9087
spring-boot-v3-aop = { group = "org.springframework.boot", name = "spring-boot-starter-aop" } # , version.ref = "spring-boot-v3"
9188
spring-boot-v3-test = { group = "org.springframework.boot", name = "spring-boot-starter-test" } # , version.ref = "spring-boot-v3"
9289
spring-boot-v3-webflux = { group = "org.springframework.boot", name = "spring-boot-starter-webflux" } # , version.ref = "spring-boot-v3"
@@ -140,12 +137,12 @@ gradle-common-publication = { group = "love.forte.gradle.common", name = "gradle
140137
mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
141138

142139
# benchmark
143-
kotlinx-benchmark-runtime = { group = "org.jetbrains.kotlinx", name = "kotlinx-benchmark-runtime", version.ref = "kotlinxBenchmark" }
140+
#kotlinx-benchmark-runtime = { group = "org.jetbrains.kotlinx", name = "kotlinx-benchmark-runtime", version.ref = "kotlinxBenchmark" }
144141

145142

146143
[plugins]
147144
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
148-
kotlinxBenchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinxBenchmark" }
145+
#kotlinxBenchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinxBenchmark" }
149146
kotlinAllOpen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
150147
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
151148
# Kover
@@ -156,6 +153,10 @@ kotlinxKover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.3" }
156153
# https://github.com/Kotlin/binary-compatibility-validator
157154
kotlinxBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
158155

156+
spring = { id = "org.springframework.boot", version.ref = "spring-boot-v3" }
157+
spring-dependencyManagement = { id = "io.spring.dependency-management", version = "1.1.5" }
158+
kotlin-plugin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
159+
159160
[bundles]
160161
gradle-common = ["gradle-common-core", "gradle-common-multiplatform", "gradle-common-publication"]
161162
dokka = ["dokka-plugin", "dokka-core", "dokka-base"]

tests/spring-boot-starter-test/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
plugins {
2525
kotlin("jvm")
26-
id("org.springframework.boot") version "3.3.1"
27-
id("io.spring.dependency-management") version "1.1.5"
28-
kotlin("plugin.spring") version "2.0.10"
26+
alias(libs.plugins.spring)
27+
alias(libs.plugins.spring.dependencyManagement)
28+
alias(libs.plugins.kotlin.plugin.spring)
2929
}
3030

3131
java {

0 commit comments

Comments
 (0)