Skip to content

Commit 1dcd608

Browse files
fix(deps): update kotlin (#4552)
* fix(deps): update kotlin * Fix deprecation warning * Remove this workaround, it's not needed anymore, and was causing a compilation error: * What went wrong: A problem occurred configuring project ':libraries:session-storage:impl'. > Failed to notify project evaluation listener. > Element 'kspDebugKotlin' of type 'com.google.devtools.ksp.gradle.KspAATask_Decorated' from container 'task set' cannot be cast to 'org.jetbrains.kotlin.gradle.tasks.KotlinCompile'. > Element 'kspReleaseKotlin' of type 'com.google.devtools.ksp.gradle.KspAATask_Decorated' from container 'task set' cannot be cast to 'org.jetbrains.kotlin.gradle.tasks.KotlinCompile'. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Benoit Marty <[email protected]>
1 parent bec9239 commit 1dcd608

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android_gradle_plugin = "8.9.1"
77
kotlin = "2.1.20"
88
kotlinpoet = "2.1.0"
9-
ksp = "2.1.20-1.0.32"
9+
ksp = "2.1.20-2.0.0"
1010
firebaseAppDistribution = "5.1.1"
1111

1212
# AndroidX
@@ -29,7 +29,7 @@ compose_bom = "2025.03.01"
2929
composecompiler = "1.5.15"
3030

3131
# Coroutines
32-
coroutines = "1.10.1"
32+
coroutines = "1.10.2"
3333

3434
# Accompanist
3535
accompanist = "0.37.2"

libraries/session-storage/impl/build.gradle.kts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import extension.setupAnvil
2-
import org.gradle.internal.extensions.stdlib.capitalized
3-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
42

53
/*
64
* Copyright 2023, 2024 New Vector Ltd.
@@ -52,15 +50,3 @@ sqldelight {
5250
}
5351
}
5452
}
55-
56-
// Workaround for KSP not picking up the generated files from SqlDelight
57-
androidComponents {
58-
onVariants(selector().all()) { variant ->
59-
afterEvaluate {
60-
val variantName = variant.name.capitalized()
61-
tasks.getByName<KotlinCompile>("ksp${variantName}Kotlin") {
62-
setSource(tasks.getByName("generate${variantName}SessionDatabaseInterface").outputs)
63-
}
64-
}
65-
}
66-
}

plugins/src/main/kotlin/extension/KoverExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private fun Project.kover(action: Action<KoverProjectExtension>) {
4949

5050
fun Project.setupKover() {
5151
// Create verify all task joining all existing verification tasks
52-
task("koverVerifyAll") {
52+
tasks.register("koverVerifyAll") {
5353
group = "verification"
5454
description = "Verifies the code coverage of all subprojects."
5555
val dependencies = listOf(":app:koverVerifyGplayDebug") + koverVariants.map { ":app:koverVerify${it.replaceFirstChar(Char::titlecase)}" }

0 commit comments

Comments
 (0)