From d943ea5a2fde981b94c7c64765ebe528782ea736 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 21:36:11 +0000 Subject: [PATCH 1/4] Update kotlin --- gradle/libs.versions.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3bcb447e4d..7b4fdab1d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,9 +4,9 @@ [versions] # Project android_gradle_plugin = "8.7.1" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinpoetKsp = "1.18.1" -ksp = "2.0.20-1.0.25" +ksp = "2.0.21-1.0.25" firebaseAppDistribution = "5.0.0" # AndroidX @@ -29,7 +29,7 @@ compose_bom = "2024.09.03" composecompiler = "1.5.15" # Coroutines -coroutines = "1.8.1" +coroutines = "1.9.0" # Accompanist accompanist = "0.36.0" @@ -39,9 +39,9 @@ test_core = "1.6.1" #other coil = "2.7.0" -datetime = "0.6.0" +datetime = "0.6.1" dependencyAnalysis = "2.1.4" -serialization_json = "1.6.3" +serialization_json = "1.7.3" showkase = "1.0.3" appyx = "1.4.0" sqldelight = "2.0.2" @@ -161,7 +161,7 @@ coil_test = { module = "io.coil-kt:coil-test", version.ref = "coil" } compound = { module = "io.element.android:compound-android", version = "0.1.1" } datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" } serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" } -kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7" +kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8" showkase = { module = "com.airbnb.android:showkase", version.ref = "showkase" } showkase_processor = { module = "com.airbnb.android:showkase-processor", version.ref = "showkase" } jsoup = "org.jsoup:jsoup:1.18.1" From fa13d85d7439e8042b49796aff57941bc7181b3c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 15 Oct 2024 00:22:30 +0200 Subject: [PATCH 2/4] fix compilation warning --- .../android/libraries/core/coroutine/DerivedStateFlow.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/DerivedStateFlow.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/DerivedStateFlow.kt index 68748ecdb5..a54d0eb9d8 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/DerivedStateFlow.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/DerivedStateFlow.kt @@ -7,6 +7,7 @@ package io.element.android.libraries.core.coroutine +import kotlinx.coroutines.ExperimentalForInheritanceCoroutinesApi import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.FlowCollector @@ -19,6 +20,7 @@ import kotlinx.coroutines.flow.stateIn * A [StateFlow] that derives its value from a [Flow]. * Useful when you want to apply transformations to a [Flow] and expose it as a [StateFlow]. */ +@OptIn(ExperimentalForInheritanceCoroutinesApi::class) class DerivedStateFlow( private val getValue: () -> T, private val flow: Flow From baed5f8d188ed6bdf9784f3e65235f88002c4a18 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 15 Oct 2024 00:22:46 +0200 Subject: [PATCH 3/4] Kotlin 2.0.21 --- .idea/kotlinc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index d4b7accbaa..c224ad564b 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file From c087becee10551ca89c031d9c8bc8f97b3c86e26 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 30 Oct 2024 21:00:52 +0100 Subject: [PATCH 4/4] Fix test `present - with CallType RoomCall sets call as active, loads URL, runs WidgetDriver and notifies the other clients a call started` not passing. --- .../android/services/analytics/test/FakeScreenTracker.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeScreenTracker.kt b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeScreenTracker.kt index 7065016204..4ac0f7ffd2 100644 --- a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeScreenTracker.kt +++ b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeScreenTracker.kt @@ -8,6 +8,7 @@ package io.element.android.services.analytics.test import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import im.vector.app.features.analytics.plan.MobileScreen import io.element.android.services.analytics.api.ScreenTracker import io.element.android.tests.testutils.lambda.lambdaError @@ -17,6 +18,8 @@ class FakeScreenTracker( ) : ScreenTracker { @Composable override fun TrackScreen(screen: MobileScreen.ScreenName) { - trackScreenLambda(screen) + LaunchedEffect(Unit) { + trackScreenLambda(screen) + } } }