From 23c9b902d48fcb21b9a6b495c21991803182f9a9 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Sat, 3 Jul 2021 00:06:53 -0700 Subject: [PATCH] Change duration usages to fix deprecation warnings --- temporal/src/commonTest/kotlin/TemporalFlowTests.kt | 3 ++- temporal/src/commonTest/kotlin/TickerTests.kt | 6 +++--- temporal/src/jsMain/kotlin/TickerTemporalFlow.kt | 6 +++--- temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/temporal/src/commonTest/kotlin/TemporalFlowTests.kt b/temporal/src/commonTest/kotlin/TemporalFlowTests.kt index ec7a50a1..5f5e6a07 100644 --- a/temporal/src/commonTest/kotlin/TemporalFlowTests.kt +++ b/temporal/src/commonTest/kotlin/TemporalFlowTests.kt @@ -8,11 +8,12 @@ import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.time.Duration import kotlin.time.ExperimentalTime import kotlin.time.seconds @ExperimentalTime -private val EPSILON = 5.seconds +private val EPSILON = Duration.seconds(5) @ExperimentalTime @AndroidIgnore("Cannot use Android classes BroadcastReceiver or IntentFilter.") diff --git a/temporal/src/commonTest/kotlin/TickerTests.kt b/temporal/src/commonTest/kotlin/TickerTests.kt index 34b68288..26eed4ea 100644 --- a/temporal/src/commonTest/kotlin/TickerTests.kt +++ b/temporal/src/commonTest/kotlin/TickerTests.kt @@ -11,9 +11,9 @@ import kotlin.test.Ignore import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue +import kotlin.time.Duration import kotlin.time.ExperimentalTime import kotlin.time.TimeSource -import kotlin.time.seconds private const val NUM_TICKS = 5 @@ -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 = 0.5.seconds +private val TIME_TICK = Duration.seconds(0.5) @ExperimentalTime private val TIME_EXPECTED = TIME_TICK * (NUM_TICKS - 1) @ExperimentalTime -private val TIME_EPSILON = 0.125.seconds +private val TIME_EPSILON = Duration.seconds(0.125) @ExperimentalTime class TickerTests { diff --git a/temporal/src/jsMain/kotlin/TickerTemporalFlow.kt b/temporal/src/jsMain/kotlin/TickerTemporalFlow.kt index d1755cc6..0500c76b 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.ExperimentalTime -import kotlin.time.minutes @ExperimentalTime internal actual inline fun inlineTemporalFlow( crossinline factory: () -> T -): Flow = ticker(1.minutes, factory) +): Flow = ticker(Duration.minutes(1), factory) @ExperimentalTime public actual fun temporalFlow( factory: () -> T -): Flow = ticker(1.minutes, factory) +): Flow = ticker(Duration.minutes(1), factory) diff --git a/temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt b/temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt index 6bbf13e8..e35850e7 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.minutes +import kotlin.time.Duration internal actual inline fun inlineTemporalFlow( crossinline factory: () -> T -): Flow = ticker(1.minutes, factory) +): Flow = ticker(Duration.minutes(1), factory) public actual fun temporalFlow( factory: () -> T -): Flow = ticker(1.minutes, factory) +): Flow = ticker(Duration.minutes(1), factory)