Skip to content

Commit d2072b4

Browse files
committed
bump Kotlin, Gradle and a bunch of other things
1 parent 7a05702 commit d2072b4

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

build-logic/build.gradle.kts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2-
31
plugins {
4-
alias(libs.plugins.kotlin19)
5-
alias(libs.plugins.ksp19)
2+
alias(libs.plugins.kgp.jvm)
3+
alias(libs.plugins.ksp)
64
alias(libs.plugins.gratatouille)
5+
alias(libs.plugins.compat.patrouille)
76
}
87

98
dependencies {
@@ -36,10 +35,8 @@ dependencies {
3635
}
3736

3837
group = "build-logic"
39-
tasks.withType(JavaCompile::class.java).configureEach {
40-
this.options.release.set(17)
41-
}
4238

43-
tasks.withType(KotlinCompile::class.java).configureEach {
44-
this.kotlinOptions.jvmTarget = "17"
39+
compatPatrouille {
40+
java(17)
41+
kotlin(embeddedKotlinVersion)
4542
}

gradle/libs.versions.toml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[versions]
2-
kotlin19 = "1.9.25"
3-
ksp19 = "1.9.25-1.0.20"
42
kotlin = "2.1.20"
5-
ksp = "2.1.20-1.0.31"
3+
ksp = "2.1.20-2.0.0"
64
kotlinx-coroutines = "1.10.1"
75
kotlinx-datetime = "0.6.2"
86
apollo-kotlin-execution = "0.1.1-SNAPSHOT-3e89cc694ab96bae7b4c1b7b6394c211065551c1"
@@ -200,7 +198,7 @@ plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serializat
200198
plugin-kotlin-spring = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" }
201199
plugin-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
202200
plugin-spring-boot = { module = "org.springframework.boot:spring-boot-gradle-plugin", version = "3.4.4" }
203-
plugin-wire = { module = "com.squareup.wire:wire-gradle-plugin", version = "4.9.11" }
201+
plugin-wire = { module = "com.squareup.wire:wire-gradle-plugin", version = "5.3.1" }
204202
plugin-compose-multiplatform = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-multiplatform" }
205203
roborazzi-gradle-plugin = { module = "io.github.takahirom.roborazzi:roborazzi-gradle-plugin", version.ref = "roborazzi" }
206204
scrimage-core = "com.sksamuel.scrimage:scrimage-core:4.3.0"
@@ -242,9 +240,7 @@ jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-multip
242240
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
243241
composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "compose-hot-reload" }
244242
screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"}
245-
#noinspection SimilarGradleDependency
243+
kgp-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
246244
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
247-
#noinspection SimilarGradleDependency
248-
ksp19 = { id = "com.google.devtools.ksp", version.ref = "ksp19" }
249-
kotlin19 = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin19" }
250245
gratatouille = { id = "com.gradleup.gratatouille", version = "0.0.4" }
246+
compat-patrouille = { id = "com.gradleup.compat.patrouille", version = "0.0.0" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)