Skip to content

Commit 37ae544

Browse files
fix(deps): update kotlin monorepo to v2.3.0 (#1003)
* fix(deps): update kotlin monorepo to v2.3.0 * Fix build errors and migrate from KAPT to KSP --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Florent Maitre <[email protected]>
1 parent e6a5b92 commit 37ae544

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
id("firebase")
2323
id(libs.plugins.android.application.get().pluginId) // https://github.com/gradle/gradle/issues/20084#issuecomment-1060822638
2424
id(libs.plugins.kotlin.android.get().pluginId)
25-
id(libs.plugins.kotlin.kapt.get().pluginId)
25+
alias(libs.plugins.ksp)
2626
id(libs.plugins.kotlin.parcelize.get().pluginId)
2727
alias(libs.plugins.compose.compiler)
2828
id(libs.plugins.firebase.appdistribution.get().pluginId)
@@ -140,7 +140,8 @@ dependencies {
140140
implementation(libs.firebase.crashlytics)
141141
implementation(libs.haze)
142142
implementation(libs.hilt.android)
143-
kapt(libs.hilt.compiler)
143+
ksp(libs.hilt.compiler)
144+
ksp(libs.kotlin.metadata.jvm) // TODO Remove when https://github.com/google/dagger/pull/5062 is merged. See also https://github.com/google/dagger/issues/5001
144145
implementation(libs.kotlin.reflect)
145146
}
146147

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ plugins {
1919
id(libs.plugins.firebase.appdistribution.get().pluginId) apply false
2020
alias(libs.plugins.firebase.crashlytics) apply false
2121
alias(libs.plugins.google.services) apply false
22+
alias(libs.plugins.ksp) apply false
2223
id(libs.plugins.dokka.get().pluginId) // https://github.com/gradle/gradle/issues/20084#issuecomment-1060822638
2324
id("github")
2425
id("release")

core/src/main/java/com/orange/ouds/core/component/content/OudsPolymorphicComponentContent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ internal fun OudsPolymorphicComponentContent.PolymorphicContent(modifier: Modifi
3333
}
3434

3535
@Composable
36-
internal fun <T> OudsPolymorphicComponentContent.PolymorphicContent(extraParameters: T) {
36+
internal fun <T> OudsPolymorphicComponentContent.PolymorphicContent(extraParameters: T) where T : OudsComponentContent.ExtraParameters {
3737
@Suppress("UNCHECKED_CAST")
3838
return (this as OudsComponentContent<T>).Content(extraParameters)
3939
}
4040

4141
@Composable
42-
internal fun <T> OudsPolymorphicComponentContent.PolymorphicContent(modifier: Modifier, extraParameters: T) {
42+
internal fun <T> OudsPolymorphicComponentContent.PolymorphicContent(modifier: Modifier, extraParameters: T) where T : OudsComponentContent.ExtraParameters {
4343
@Suppress("UNCHECKED_CAST")
4444
return (this as OudsComponentContent<T>).Content(modifier, extraParameters)
4545
}

gradle/libs.versions.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ hilt = "2.57.2"
2424
hiltNavigationCompose = "1.3.0"
2525
javaPoet = "1.13.0"
2626
json = "20250517"
27-
kotlin = "2.2.21"
27+
kotlin = "2.3.0"
28+
ksp = "2.3.4"
2829
material = "1.13.0"
2930
mockitoAndroid = "5.21.0"
3031
mockitoKotlin = "6.1.0"
@@ -72,6 +73,7 @@ hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.r
7273
javapoet = { group = "com.squareup", name = "javapoet", version.ref = "javaPoet" }
7374
json = { module = "org.json:json", version.ref = "json" }
7475
kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
76+
kotlin-metadata-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-metadata-jvm", version.ref = "kotlin" }
7577
kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
7678
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
7779
mockito-android = { group = "org.mockito", name = "mockito-android", version.ref = "mockitoAndroid" }
@@ -91,7 +93,7 @@ firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "
9193
google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
9294
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
9395
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
94-
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
9596
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
97+
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
9698
paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" }
9799

0 commit comments

Comments
 (0)