Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

fix(deps): update kotlin (#4552)

Browse source 
* 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 <benoit@matrix.org>
This commit is contained in:
renovate[bot] 2025-04-09 16:45:48 +02:00 • committed by GitHub
parent adf378cc0c
commit 88727098ec
3 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gradle/libs.versions.toml
View file

@ -6,7 +6,7 @@
android_gradle_plugin = "8.9.1" android_gradle_plugin = "8.9.1"
kotlin = "2.1.20" kotlin = "2.1.20"
kotlinpoet = "2.1.0" kotlinpoet = "2.1.0"
ksp = "2.1.20-1.0.32" ksp = "2.1.20-2.0.0"
firebaseAppDistribution = "5.1.1" firebaseAppDistribution = "5.1.1"
# AndroidX # AndroidX
@ -29,7 +29,7 @@ compose_bom = "2025.03.01"
composecompiler = "1.5.15" composecompiler = "1.5.15"
# Coroutines # Coroutines
coroutines = "1.10.1" coroutines = "1.10.2"
# Accompanist # Accompanist
accompanist = "0.37.2" accompanist = "0.37.2"

14
libraries/session-storage/impl/build.gradle.kts
View file

@ -1,6 +1,4 @@
import extension.setupAnvil import extension.setupAnvil
import org.gradle.internal.extensions.stdlib.capitalized
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
/* /*
* Copyright 2023, 2024 New Vector Ltd. * Copyright 2023, 2024 New Vector Ltd.
@ -52,15 +50,3 @@ sqldelight {
} }
} }
} }
// Workaround for KSP not picking up the generated files from SqlDelight
androidComponents {
onVariants(selector().all()) { variant ->
afterEvaluate {
val variantName = variant.name.capitalized()
tasks.getByName<KotlinCompile>("ksp${variantName}Kotlin") {
setSource(tasks.getByName("generate${variantName}SessionDatabaseInterface").outputs)
}
}
}
}

2
plugins/src/main/kotlin/extension/KoverExtension.kt
View file

@ -49,7 +49,7 @@ private fun Project.kover(action: Action<KoverProjectExtension>) {
fun Project.setupKover() { fun Project.setupKover() {
// Create verify all task joining all existing verification tasks // Create verify all task joining all existing verification tasks
task("koverVerifyAll") { tasks.register("koverVerifyAll") {
group = "verification" group = "verification"
description = "Verifies the code coverage of all subprojects." description = "Verifies the code coverage of all subprojects."
val dependencies = listOf(":app:koverVerifyGplayDebug") + koverVariants.map { ":app:koverVerify${it.replaceFirstChar(Char::titlecase)}" } val dependencies = listOf(":app:koverVerifyGplayDebug") + koverVariants.map { ":app:koverVerify${it.replaceFirstChar(Char::titlecase)}" }