Skip to content

Commit

Permalink
Merge pull request #3283 from element-hq/renovate/kotlin
Browse files Browse the repository at this point in the history
Update kotlin
  • Loading branch information
bmarty authored Oct 31, 2024
2 parents 0efe3bc + c087bec commit c11a503
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 11 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
[versions]
# Project
android_gradle_plugin = "8.7.1"
kotlin = "2.0.20"
kotlin = "2.0.21"
kotlinpoet = "2.0.0"
ksp = "2.0.20-1.0.25"
ksp = "2.0.21-1.0.25"
firebaseAppDistribution = "5.0.0"

# AndroidX
Expand All @@ -29,25 +29,29 @@ compose_bom = "2024.10.00"
composecompiler = "1.5.15"

# Coroutines
coroutines = "1.8.1"
coroutines = "1.9.0"

# Accompanist
accompanist = "0.36.0"

# Test
test_core = "1.6.1"

# Jetbrain
datetime = "0.6.1"
serialization_json = "1.7.3"

#other
coil = "2.7.0"
datetime = "0.6.0"
dependencyAnalysis = "2.3.0"
serialization_json = "1.6.3"
showkase = "1.0.3"
appyx = "1.4.0"
sqldelight = "2.0.2"
wysiwyg = "2.37.13"
telephoto = "0.13.0"

# Dependency analysis
dependencyAnalysis = "2.3.0"

# DI
dagger = "2.52"
anvil = "0.3.3"
Expand Down Expand Up @@ -162,7 +166,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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<T>(
private val getValue: () -> T,
private val flow: Flow<T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -17,6 +18,8 @@ class FakeScreenTracker(
) : ScreenTracker {
@Composable
override fun TrackScreen(screen: MobileScreen.ScreenName) {
trackScreenLambda(screen)
LaunchedEffect(Unit) {
trackScreenLambda(screen)
}
}
}

0 comments on commit c11a503

Please sign in to comment.