Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency org.jetbrains.kotlin.multiplatform to v1.8.0 #222

Merged
merged 6 commits into from
Jan 13, 2023
Merged

Update dependency org.jetbrains.kotlin.multiplatform to v1.8.0 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
baf5f00
Update dependency org.jetbrains.kotlin.multiplatform to v1.8.0
juul-mobile-bot Jan 6, 2023
00c4b7b
Merge branch 'main' into renovate/kotlin
twyatt Jan 12, 2023
beed8d7
Bump AtomicFU
twyatt Jan 13, 2023
028b483
Merge branch 'main' into renovate/kotlin
twyatt Jan 13, 2023
630076f
Fix compilation errors
twyatt Jan 13, 2023
fe49eff
More compilation fixes
twyatt Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2"

[libraries]
Expand All @@ -18,7 +18,7 @@ ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
[plugins]
android-library = { id = "com.android.library", version = "7.4.0" }
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" }
Expand Down
6 changes: 3 additions & 3 deletions temporal/src/commonTest/kotlin/TickerTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions temporal/src/jsMain/kotlin/TickerTemporalFlow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <T> inlineTemporalFlow(
crossinline factory: () -> T,
): Flow<T> = ticker(Duration.minutes(1), factory)
): Flow<T> = ticker(1.minutes, factory)

@ExperimentalTime
public actual fun <T> temporalFlow(
factory: () -> T,
): Flow<T> = ticker(Duration.minutes(1), factory)
): Flow<T> = ticker(1.minutes, factory)
6 changes: 3 additions & 3 deletions temporal/src/jvmMain/kotlin/TickerTemporalFlow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <T> inlineTemporalFlow(
crossinline factory: () -> T,
): Flow<T> = ticker(Duration.minutes(1), factory)
): Flow<T> = ticker(1.minutes, factory)

public actual fun <T> temporalFlow(
factory: () -> T,
): Flow<T> = ticker(Duration.minutes(1), factory)
): Flow<T> = ticker(1.minutes, factory)