kotlinx.datetime 0.7.0. (#327)

ychescale9 · web-flow · commit 60ff024da415 · 2025-06-25T20:20:57.000+10:00
- Replace `kotlinx.datetime.Instant` and `kotlinx.datetime.Clock` with `kotlin.time.Instant` and `kotlin.time.Clock`. - Replace `KotlinxInstantAdapter` with custom adapter until apollographql/apollo-kotlin-adapters#31 is fixed
diff --git a/android/feature/home/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/feature/home/HomeScreenTest.kt b/android/feature/home/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/feature/home/HomeScreenTest.kt
@@ -13,10 +13,10 @@ import io.github.reactivecircus.kstreamlined.kmp.model.feed.DisplayableFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.presentation.home.HomeFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.presentation.home.HomeUiState
-import kotlinx.datetime.Instant
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.time.Instant
 
 @RunWith(ThemeVariantInjector::class)
 class HomeScreenTest {
diff --git a/android/feature/saved-for-later/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/feature/savedforlater/SavedForLaterScreenTest.kt b/android/feature/saved-for-later/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/feature/savedforlater/SavedForLaterScreenTest.kt
@@ -12,10 +12,10 @@ import io.github.reactivecircus.kstreamlined.android.foundation.screenshottestin
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.DisplayableFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.presentation.savedforlater.SavedForLaterUiState
-import kotlinx.datetime.Instant
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.time.Instant
 
 @RunWith(ThemeVariantInjector::class)
 class SavedForLaterScreenTest {
diff --git a/android/foundation/common-ui/feed/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinBlogCard.kt b/android/foundation/common-ui/feed/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinBlogCard.kt
@@ -34,7 +34,7 @@ import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.fou
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.DisplayableFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 @Composable
 public fun SharedTransitionScope.KotlinBlogCard(
diff --git a/android/foundation/common-ui/feed/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinWeeklyCard.kt b/android/foundation/common-ui/feed/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinWeeklyCard.kt
@@ -27,7 +27,7 @@ import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.fou
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.DisplayableFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 @Composable
 public fun KotlinWeeklyCard(
diff --git a/android/foundation/common-ui/feed/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinYouTubeCard.kt b/android/foundation/common-ui/feed/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinYouTubeCard.kt
@@ -42,7 +42,7 @@ import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.fou
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.DisplayableFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 @Composable
 public fun SharedTransitionScope.KotlinYouTubeCard(
diff --git a/android/foundation/common-ui/feed/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/TalkingKotlinCard.kt b/android/foundation/common-ui/feed/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/TalkingKotlinCard.kt
@@ -49,7 +49,7 @@ import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.fou
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.DisplayableFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 @Composable
 public fun SharedTransitionScope.TalkingKotlinCard(
diff --git a/android/foundation/common-ui/feed/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinBlogCardTest.kt b/android/foundation/common-ui/feed/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinBlogCardTest.kt
@@ -11,10 +11,10 @@ import io.github.reactivecircus.kstreamlined.android.foundation.screenshottestin
 import io.github.reactivecircus.kstreamlined.android.foundation.screenshottesting.tester.ThemeVariant
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
-import kotlinx.datetime.Instant
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.time.Instant
 
 @OptIn(ExperimentalSharedTransitionApi::class)
 @RunWith(TestParameterInjector::class)
diff --git a/android/foundation/common-ui/feed/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinWeeklyCardTest.kt b/android/foundation/common-ui/feed/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinWeeklyCardTest.kt
@@ -9,10 +9,10 @@ import io.github.reactivecircus.kstreamlined.android.foundation.screenshottestin
 import io.github.reactivecircus.kstreamlined.android.foundation.screenshottesting.tester.ThemeVariant
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
-import kotlinx.datetime.Instant
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.time.Instant
 
 @RunWith(TestParameterInjector::class)
 class KotlinWeeklyCardTest {
diff --git a/android/foundation/common-ui/feed/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinYouTubeCardTest.kt b/android/foundation/common-ui/feed/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/KotlinYouTubeCardTest.kt
@@ -11,10 +11,10 @@ import io.github.reactivecircus.kstreamlined.android.foundation.screenshottestin
 import io.github.reactivecircus.kstreamlined.android.foundation.screenshottesting.tester.ThemeVariant
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
-import kotlinx.datetime.Instant
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.time.Instant
 
 @OptIn(ExperimentalSharedTransitionApi::class)
 @RunWith(TestParameterInjector::class)
diff --git a/android/foundation/common-ui/feed/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/TalkingKotlinCardTest.kt b/android/foundation/common-ui/feed/src/test/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/commonui/feed/TalkingKotlinCardTest.kt
@@ -11,10 +11,10 @@ import io.github.reactivecircus.kstreamlined.android.foundation.screenshottestin
 import io.github.reactivecircus.kstreamlined.android.foundation.screenshottesting.tester.ThemeVariant
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
-import kotlinx.datetime.Instant
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.time.Instant
 
 @OptIn(ExperimentalSharedTransitionApi::class)
 @RunWith(TestParameterInjector::class)
diff --git a/build-logic/kstreamlined-gradle-plugin/src/main/kotlin/io/github/reactivecircus/kstreamlined/gradle/buildlogic/kotlinBuildLogic.kt b/build-logic/kstreamlined-gradle-plugin/src/main/kotlin/io/github/reactivecircus/kstreamlined/gradle/buildlogic/kotlinBuildLogic.kt
@@ -32,6 +32,7 @@ internal fun KotlinProjectExtension.configureKotlin(
     sourceSets.configureEach {
         languageSettings {
             progressiveMode = true
+            optIn("kotlin.time.ExperimentalTime")
             optIn("kotlin.experimental.ExperimentalObjCName")
             enableLanguageFeature("ContextParameters")
             enableLanguageFeature("ExplicitBackingFields")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ skie = "0.10.4"
 leakcanary = "2.14"
 hilt = "2.56.2"
 kotlinx-coroutines = "1.10.2"
-kotlinx-datetime = "0.6.2"
+kotlinx-datetime = "0.7.0"
 kotlinx-serialization = "1.8.1"
 firebase-analytics = "22.4.0"
 firebase-appDistributionPlugin = "5.1.1"
diff --git a/kmp/database-testing/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/database/testing/utils.kt b/kmp/database-testing/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/database/testing/utils.kt
@@ -4,7 +4,7 @@ import io.github.reactivecircus.kstreamlined.kmp.database.FeedItemEntity
 import io.github.reactivecircus.kstreamlined.kmp.database.FeedOriginEntity
 import io.github.reactivecircus.kstreamlined.kmp.database.KStreamlinedDatabase
 import io.github.reactivecircus.kstreamlined.kmp.database.SyncResourceType
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 public fun KStreamlinedDatabase.insertFeedOrigins(feedOrigins: List<FeedOriginEntity>) {
     transaction {
diff --git a/kmp/database/build.gradle.kts b/kmp/database/build.gradle.kts
@@ -18,7 +18,6 @@ kotlin {
         commonMain {
             dependencies {
                 api(libs.sqldelight.coroutinesExtensions)
-                api(libs.kotlinx.datetime)
             }
         }
     }
diff --git a/kmp/database/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/database/adapters.kt b/kmp/database/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/database/adapters.kt
@@ -1,7 +1,7 @@
 package io.github.reactivecircus.kstreamlined.kmp.database
 
 import app.cash.sqldelight.ColumnAdapter
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 public val InstantAdapter: ColumnAdapter<Instant, String> = object : ColumnAdapter<Instant, String> {
     override fun decode(databaseValue: String): Instant {
diff --git a/kmp/database/src/commonMain/sqldelight/io/github/reactivecircus/kstreamlined/kmp/database/FeedItemEntity.sq b/kmp/database/src/commonMain/sqldelight/io/github/reactivecircus/kstreamlined/kmp/database/FeedItemEntity.sq
@@ -1,6 +1,6 @@
 import io.github.reactivecircus.kstreamlined.kmp.database.ContentFormat;
 import kotlin.Boolean;
-import kotlinx.datetime.Instant;
+import kotlin.time.Instant;
 
 CREATE TABLE feedItemEntity (
     id TEXT NOT NULL PRIMARY KEY,
diff --git a/kmp/database/src/commonMain/sqldelight/io/github/reactivecircus/kstreamlined/kmp/database/LastSyncMetadata.sq b/kmp/database/src/commonMain/sqldelight/io/github/reactivecircus/kstreamlined/kmp/database/LastSyncMetadata.sq
@@ -1,5 +1,5 @@
 import io.github.reactivecircus.kstreamlined.kmp.database.SyncResourceType;
-import kotlinx.datetime.Instant;
+import kotlin.time.Instant;
 
 CREATE TABLE lastSyncMetadata (
     resource_type TEXT AS SyncResourceType NOT NULL,
diff --git a/kmp/feed-datasource/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/FeedDataSourceTest.kt b/kmp/feed-datasource/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/FeedDataSourceTest.kt
@@ -11,11 +11,11 @@ import io.github.reactivecircus.kstreamlined.kmp.remote.FakeFeedService
 import io.github.reactivecircus.kstreamlined.kmp.remote.FakeKotlinWeeklyIssueEntries
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Instant
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNull
+import kotlin.time.Instant
 
 class FeedDataSourceTest {
 
diff --git a/kmp/feed-datasource/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/mapper/FeedItemMappersTest.kt b/kmp/feed-datasource/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/mapper/FeedItemMappersTest.kt
@@ -4,10 +4,10 @@ import io.github.reactivecircus.kstreamlined.kmp.database.ContentFormat
 import io.github.reactivecircus.kstreamlined.kmp.database.FeedItemEntity
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedOrigin
-import kotlinx.datetime.Instant
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.time.Instant
 
 class FeedItemMappersTest {
 
diff --git a/kmp/feed-sync/runtime/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/FeedSyncEngineImpl.kt b/kmp/feed-sync/runtime/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/FeedSyncEngineImpl.kt
@@ -30,8 +30,8 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.datetime.Clock
 import kotlin.coroutines.cancellation.CancellationException
+import kotlin.time.Clock
 
 public class FeedSyncEngineImpl(
     private val feedService: FeedService,
diff --git a/kmp/feed-sync/runtime/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/SyncRequestEvaluator.kt b/kmp/feed-sync/runtime/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/SyncRequestEvaluator.kt
@@ -4,7 +4,7 @@ import io.github.reactivecircus.kstreamlined.kmp.database.FeedOriginEntityQuerie
 import io.github.reactivecircus.kstreamlined.kmp.database.LastSyncMetadataQueries
 import io.github.reactivecircus.kstreamlined.kmp.database.SyncResourceType
 import io.github.reactivecircus.kstreamlined.kmp.feed.sync.mapper.toSyncParams
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 
 internal class SyncRequestEvaluator(
     private val syncConfig: SyncConfig,
diff --git a/kmp/feed-sync/runtime/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/FakeClock.kt b/kmp/feed-sync/runtime/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/FakeClock.kt
@@ -1,7 +1,7 @@
 package io.github.reactivecircus.kstreamlined.kmp.feed.sync
 
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
+import kotlin.time.Clock
+import kotlin.time.Instant
 
 class FakeClock : Clock {
     var currentTime: Instant = Instant.parse("2023-12-03T03:10:54Z")
diff --git a/kmp/feed-sync/runtime/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/FeedSyncEngineImplTest.kt b/kmp/feed-sync/runtime/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/FeedSyncEngineImplTest.kt
@@ -22,11 +22,11 @@ import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Instant
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.seconds
+import kotlin.time.Instant
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class FeedSyncEngineImplTest {
diff --git a/kmp/feed-sync/runtime/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/mapper/FeedItemEntityMappersTest.kt b/kmp/feed-sync/runtime/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/sync/mapper/FeedItemEntityMappersTest.kt
@@ -4,9 +4,9 @@ import io.github.reactivecircus.kstreamlined.kmp.database.ContentFormat
 import io.github.reactivecircus.kstreamlined.kmp.database.FeedItemEntity
 import io.github.reactivecircus.kstreamlined.kmp.remote.model.FeedEntry
 import io.github.reactivecircus.kstreamlined.kmp.remote.model.FeedSource
-import kotlinx.datetime.Instant
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Instant
 
 class FeedItemEntityMappersTest {
 
diff --git a/kmp/model/build.gradle.kts b/kmp/model/build.gradle.kts
@@ -1,13 +1,3 @@
 plugins {
     id("kstreamlined.kmp.jvm-and-ios")
 }
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api(libs.kotlinx.datetime)
-            }
-        }
-    }
-}
diff --git a/kmp/model/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/model/feed/FeedItem.kt b/kmp/model/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/model/feed/FeedItem.kt
@@ -1,6 +1,6 @@
 package io.github.reactivecircus.kstreamlined.kmp.model.feed
 
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 public sealed interface FeedItem {
     public val id: String
diff --git a/kmp/presentation/content-viewer/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/contentviewer/ContentViewerPresenterTest.kt b/kmp/presentation/content-viewer/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/contentviewer/ContentViewerPresenterTest.kt
@@ -12,9 +12,9 @@ import io.github.reactivecircus.kstreamlined.kmp.remote.FakeFeedService
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Instant
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Instant
 
 class ContentViewerPresenterTest {
 
diff --git a/kmp/presentation/home/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/home/homeFeedItemMapper.kt b/kmp/presentation/home/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/home/homeFeedItemMapper.kt
@@ -4,8 +4,8 @@ import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
 import io.github.reactivecircus.kstreamlined.kmp.prettytime.timeAgo
 import io.github.reactivecircus.kstreamlined.kmp.prettytime.weeksAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
+import kotlin.time.Clock
 
 internal fun List<FeedItem>.toHomeFeedItems(
     clock: Clock = Clock.System,
diff --git a/kmp/presentation/home/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/home/HomeFeedItemMapperTest.kt b/kmp/presentation/home/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/home/HomeFeedItemMapperTest.kt
@@ -2,11 +2,11 @@ package io.github.reactivecircus.kstreamlined.kmp.presentation.home
 
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.DisplayableFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Clock
+import kotlin.time.Instant
 
 class HomeFeedItemMapperTest {
 
diff --git a/kmp/presentation/home/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/home/HomePresenterTest.kt b/kmp/presentation/home/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/home/HomePresenterTest.kt
@@ -18,13 +18,13 @@ import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.days
+import kotlin.time.Instant
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class HomePresenterTest {
diff --git a/kmp/presentation/kotlin-weekly-issue/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/kotlinweeklyissue/KotlinWeeklyIssuePresenterTest.kt b/kmp/presentation/kotlin-weekly-issue/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/kotlinweeklyissue/KotlinWeeklyIssuePresenterTest.kt
@@ -15,9 +15,9 @@ import io.github.reactivecircus.kstreamlined.kmp.remote.model.KotlinWeeklyIssueE
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Instant
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Instant
 
 class KotlinWeeklyIssuePresenterTest {
 
diff --git a/kmp/presentation/saved-for-later/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/savedforlater/SavedForLaterItemMapperTest.kt b/kmp/presentation/saved-for-later/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/savedforlater/SavedForLaterItemMapperTest.kt
@@ -2,10 +2,10 @@ package io.github.reactivecircus.kstreamlined.kmp.presentation.savedforlater
 
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.DisplayableFeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
-import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Instant
 
 class SavedForLaterItemMapperTest {
 
diff --git a/kmp/presentation/saved-for-later/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/savedforlater/SavedForLaterPresenterTest.kt b/kmp/presentation/saved-for-later/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/savedforlater/SavedForLaterPresenterTest.kt
@@ -12,10 +12,10 @@ import io.github.reactivecircus.kstreamlined.kmp.remote.FakeFeedService
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Instant
 
 class SavedForLaterPresenterTest {
 
diff --git a/kmp/presentation/talking-kotlin-episode/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/talkingkotlinepisode/TalkingKotlinEpisodeMapperTest.kt b/kmp/presentation/talking-kotlin-episode/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/talkingkotlinepisode/TalkingKotlinEpisodeMapperTest.kt
@@ -1,10 +1,10 @@
 package io.github.reactivecircus.kstreamlined.kmp.presentation.talkingkotlinepisode
 
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
-import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Instant
 
 class TalkingKotlinEpisodeMapperTest {
 
diff --git a/kmp/presentation/talking-kotlin-episode/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/talkingkotlinepisode/TalkingKotlinEpisodePresenterTest.kt b/kmp/presentation/talking-kotlin-episode/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/presentation/talkingkotlinepisode/TalkingKotlinEpisodePresenterTest.kt
@@ -13,10 +13,10 @@ import io.github.reactivecircus.kstreamlined.kmp.remote.FakeFeedService
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Instant
 
 class TalkingKotlinEpisodePresenterTest {
 
diff --git a/kmp/pretty-time/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/prettytime/prettyTime.kt b/kmp/pretty-time/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/prettytime/prettyTime.kt
@@ -1,9 +1,9 @@
 package io.github.reactivecircus.kstreamlined.kmp.prettytime
 
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
+import kotlin.time.Clock
+import kotlin.time.Instant
 
 @Suppress("MagicNumber")
 public fun Instant.weeksAgo(
diff --git a/kmp/pretty-time/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/prettytime/PrettyTimeTest.kt b/kmp/pretty-time/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/prettytime/PrettyTimeTest.kt
diff --git a/kmp/remote/cloud/build.gradle.kts b/kmp/remote/cloud/build.gradle.kts
diff --git a/kmp/remote/cloud/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/apollo/KotlinInstantAdapter.kt b/kmp/remote/cloud/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/apollo/KotlinInstantAdapter.kt
diff --git a/kmp/remote/cloud/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/CloudFeedServiceTest.kt b/kmp/remote/cloud/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/CloudFeedServiceTest.kt
diff --git a/kmp/remote/cloud/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/mapper/FeedEntryMappersTest.kt b/kmp/remote/cloud/src/commonTest/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/mapper/FeedEntryMappersTest.kt
diff --git a/kmp/remote/common/build.gradle.kts b/kmp/remote/common/build.gradle.kts
diff --git a/kmp/remote/common/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/model/FeedEntry.kt b/kmp/remote/common/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/model/FeedEntry.kt
diff --git a/kmp/remote/mock/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/mockFeedData.kt b/kmp/remote/mock/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/mockFeedData.kt
diff --git a/kmp/remote/testing/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/fakeFeedData.kt b/kmp/remote/testing/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/remote/fakeFeedData.kt
