From baf5f00a2dc11080c171130fa7fff2be49c83f3b Mon Sep 17 00:00:00 2001 From: Juul Mobile Bot Date: Fri, 6 Jan 2023 09:18:56 +0000 Subject: [PATCH 1/4] Update dependency org.jetbrains.kotlin.multiplatform to v1.8.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7a00e901..8f5d01ee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ android-compile = "31" coroutines = "1.6.4" jacoco = "0.8.7" -kotlin = "1.7.20" +kotlin = "1.8.0" ktor = "2.2.1" [libraries] From beed8d7f17248050235fa29bfb6181a985a776ca Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Fri, 13 Jan 2023 10:04:29 -0800 Subject: [PATCH 2/4] Bump AtomicFU --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 29e5ade2..902324d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" } [plugins] android-library = { id = "com.android.library", version = "7.3.1" } android-publish = { id = "com.vanniktech.maven.publish", version = "0.23.1" } -atomicfu = { id = "kotlinx-atomicfu", version = "0.18.5" } +atomicfu = { id = "kotlinx-atomicfu", version = "0.19.0" } binary-compatibility-validator = { id = "binary-compatibility-validator", version = "0.8.0" } dokka = { id = "org.jetbrains.dokka", version = "1.7.20" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } From 630076f918cd9ba478ee45073215213ddd041197 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Fri, 13 Jan 2023 13:35:24 -0800 Subject: [PATCH 3/4] Fix compilation errors --- temporal/src/jsMain/kotlin/TickerTemporalFlow.kt | 6 +++--- temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/temporal/src/jsMain/kotlin/TickerTemporalFlow.kt b/temporal/src/jsMain/kotlin/TickerTemporalFlow.kt index 45063702..ae746468 100644 --- a/temporal/src/jsMain/kotlin/TickerTemporalFlow.kt +++ b/temporal/src/jsMain/kotlin/TickerTemporalFlow.kt @@ -1,15 +1,15 @@ package com.juul.tuulbox.temporal import kotlinx.coroutines.flow.Flow -import kotlin.time.Duration +import kotlin.time.Duration.Companion.minutes import kotlin.time.ExperimentalTime @ExperimentalTime internal actual inline fun inlineTemporalFlow( crossinline factory: () -> T, -): Flow = ticker(Duration.minutes(1), factory) +): Flow = ticker(1.minutes, factory) @ExperimentalTime public actual fun temporalFlow( factory: () -> T, -): Flow = ticker(Duration.minutes(1), factory) +): Flow = ticker(1.minutes, factory) diff --git a/temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt b/temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt index 644842a8..951dc551 100644 --- a/temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt +++ b/temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt @@ -1,12 +1,12 @@ package com.juul.tuulbox.temporal import kotlinx.coroutines.flow.Flow -import kotlin.time.Duration +import kotlin.time.Duration.Companion.minutes internal actual inline fun inlineTemporalFlow( crossinline factory: () -> T, -): Flow = ticker(Duration.minutes(1), factory) +): Flow = ticker(1.minutes, factory) public actual fun temporalFlow( factory: () -> T, -): Flow = ticker(Duration.minutes(1), factory) +): Flow = ticker(1.minutes, factory) From fe49eff1681aba1b62b7732e4e14a42b8165a479 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Fri, 13 Jan 2023 14:14:32 -0800 Subject: [PATCH 4/4] More compilation fixes --- temporal/src/commonTest/kotlin/TickerTests.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/temporal/src/commonTest/kotlin/TickerTests.kt b/temporal/src/commonTest/kotlin/TickerTests.kt index 6a80e6a4..858ad379 100644 --- a/temporal/src/commonTest/kotlin/TickerTests.kt +++ b/temporal/src/commonTest/kotlin/TickerTests.kt @@ -11,7 +11,7 @@ import kotlin.test.Ignore import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue -import kotlin.time.Duration +import kotlin.time.Duration.Companion.seconds import kotlin.time.ExperimentalTime import kotlin.time.TimeSource @@ -21,13 +21,13 @@ private const val ERROR_TOO_FAST = "Flow collected too quickly." private const val ERROR_TOO_SLOW = "Flow collected too slowly." @ExperimentalTime -private val TIME_TICK = Duration.seconds(0.5) +private val TIME_TICK = 0.5.seconds @ExperimentalTime private val TIME_EXPECTED = TIME_TICK * (NUM_TICKS - 1) @ExperimentalTime -private val TIME_EPSILON = Duration.seconds(0.125) +private val TIME_EPSILON = 0.125.seconds @ExperimentalTime class TickerTests {