refactor: update time handling to use kotlin.time and enable edge-to-edge layout

softartdev · softartdev · commit 335003275aaa · 2025-06-27T20:21:37.000+04:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,19 @@
 [versions]
 kronos = "0.0.1"
-compileSdk = "35"
-targetSdk = "35"
+compileSdk = "36"
+targetSdk = "36"
 minSdk = "21"
 lyft-kronos = "0.0.1-alpha11"
-kotlin = "2.1.10"
-agp = "8.8.1"
-compose = "1.7.1"
-androidx-appcompat = "1.7.0"
-androidx-activityCompose = "1.10.0"
+kotlin = "2.2.0"
+agp = "8.11.0"
+compose = "1.8.2"
+androidx-appcompat = "1.7.1"
+androidx-activityCompose = "1.10.1"
 androidx-test = "1.6.1"
-compose-uitooling = "1.7.8"
+compose-uitooling = "1.8.3"
 napier = "2.7.1"
-kotlinx-coroutines = "1.10.1"
-kotlinx-datetime = "0.6.1"
+kotlinx-coroutines = "1.10.2"
+kotlinx-datetime = "0.7.0"
 swift-klib = "0.6.4"
 
 [libraries]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Sat Feb 15 22:48:25 GET 2025
+#Fri Jun 27 19:10:37 GET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kronos/src/androidMain/kotlin/com/softartdev/kronos/Network.kt b/kronos/src/androidMain/kotlin/com/softartdev/kronos/Network.kt
@@ -1,7 +1,10 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
 import android.content.Context
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 actual val Clock.Companion.Network: NetworkClock
     get() = AndroidNetworkClock
diff --git a/kronos/src/androidUnitTest/kotlin/com/softartdev/kronos/PlatformTest.kt b/kronos/src/androidUnitTest/kotlin/com/softartdev/kronos/PlatformTest.kt
@@ -1,9 +1,12 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
 import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
-import kotlinx.datetime.Clock
 import kotlin.test.*
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 class PlatformTest {
 
diff --git a/kronos/src/commonMain/kotlin/com/softartdev/kronos/ClockExt.kt b/kronos/src/commonMain/kotlin/com/softartdev/kronos/ClockExt.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 expect val Clock.Companion.Network: NetworkClock
diff --git a/kronos/src/commonMain/kotlin/com/softartdev/kronos/NetworkClock.kt b/kronos/src/commonMain/kotlin/com/softartdev/kronos/NetworkClock.kt
@@ -1,7 +1,10 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 interface NetworkClock : Clock {
     /**
diff --git a/kronos/src/commonTest/kotlin/com/softartdev/kronos/CommonTest.kt b/kronos/src/commonTest/kotlin/com/softartdev/kronos/CommonTest.kt
@@ -1,8 +1,11 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
-import kotlinx.datetime.Clock
 import kotlin.test.Test
 import kotlin.test.assertNull
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 class CommonTest {
 
diff --git a/kronos/src/iosMain/kotlin/com/softartdev/kronos/Network.kt b/kronos/src/iosMain/kotlin/com/softartdev/kronos/Network.kt
@@ -1,7 +1,10 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
-import kotlinx.datetime.Clock
 import platform.Foundation.NSDate
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 actual val Clock.Companion.Network: NetworkClock
     get() = IosNetworkClock
diff --git a/kronos/src/iosTest/kotlin/com/softartdev/kronos/PlatformTest.kt b/kronos/src/iosTest/kotlin/com/softartdev/kronos/PlatformTest.kt
@@ -1,10 +1,13 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.withTimeout
-import kotlinx.datetime.Clock
 import kotlin.test.*
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 class PlatformTest {
 
diff --git a/kronos/src/jvmMain/kotlin/com/softartdev/kronos/Network.kt b/kronos/src/jvmMain/kotlin/com/softartdev/kronos/Network.kt
@@ -1,6 +1,9 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 actual val Clock.Companion.Network: NetworkClock
     get() = JvmNetworkClock
diff --git a/kronos/src/jvmTest/kotlin/com/softartdev/kronos/PlatformTest.kt b/kronos/src/jvmTest/kotlin/com/softartdev/kronos/PlatformTest.kt
@@ -1,11 +1,14 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos
 
-import kotlinx.datetime.Clock
 import org.junit.Ignore
 import kotlin.test.Test
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 class PlatformTest {
 
diff --git a/sampleApp/src/androidMain/kotlin/com/softartdev/kronos/sample/App.android.kt b/sampleApp/src/androidMain/kotlin/com/softartdev/kronos/sample/App.android.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos.sample
 
 import android.app.Application
@@ -6,10 +8,12 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import com.softartdev.kronos.*
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 class AndroidApp : Application() {
     companion object {
@@ -27,13 +31,14 @@ class AndroidApp : Application() {
 class AppActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent { App() }
     }
 }
 
 internal actual fun openUrl(url: String?) {
-    val uri = url?.let { Uri.parse(it) } ?: return
-    val intent = Intent().apply {
+    val uri: Uri = url?.let(Uri::parse) ?: return
+    val intent: Intent = Intent().apply {
         action = Intent.ACTION_VIEW
         data = uri
         addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
diff --git a/sampleApp/src/commonMain/kotlin/com/softartdev/kronos/sample/TickScreen.kt b/sampleApp/src/commonMain/kotlin/com/softartdev/kronos/sample/TickScreen.kt
@@ -1,11 +1,13 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos.sample
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material.Button
 import androidx.compose.material.Checkbox
 import androidx.compose.material.CircularProgressIndicator
@@ -31,87 +33,89 @@ import com.softartdev.kronos.Network
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
+import kotlin.time.Clock
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 @Composable
-fun TickScreen() = Scaffold(topBar = {
-    TopAppBar(title = { Text(text = Greeting().greet()) })
-}, content = { paddingValues ->
-    Column(
-        modifier = Modifier.padding(
-            vertical = paddingValues.calculateTopPadding()
-                .coerceAtLeast(minimumValue = 8.dp),
-            horizontal = paddingValues.calculateStartPadding(LocalLayoutDirection.current)
-                .coerceAtLeast(minimumValue = 8.dp),
-        ),
-        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
-        var networkTime: Instant? by remember { mutableStateOf(value = clockNetworkNowOrNull()) }
-        Text(text = "Network time:", style = typography.subtitle2)
-        Text(text = networkTime.toString(), style = typography.body1)
-        var systemTime: Instant by remember { mutableStateOf(Clock.System.now()) }
-        Text(text = "System time:", style = typography.subtitle2)
-        Text(
-            text = systemTime.toLocalDateTime(TimeZone.currentSystemDefault()).toString(),
-            style = typography.body1
-        )
-        var diff: Duration? by remember {
-            mutableStateOf(value = networkTime?.let { it - systemTime })
-        }
-        Text(text = "Diff:", style = typography.subtitle2)
-        Text(text = diff.toString(), style = typography.body1)
-        var ticking by remember { mutableStateOf(false) }
-        val synced by remember { derivedStateOf { networkTime != null } }
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp)
+fun TickScreen() = Scaffold(
+    modifier = Modifier.safeDrawingPadding(),
+    topBar = { TopAppBar(title = { Text(text = Greeting().greet()) }) },
+    content = { paddingValues ->
+        Column(
+            modifier = Modifier.padding(
+                vertical = paddingValues.calculateTopPadding()
+                    .coerceAtLeast(minimumValue = 8.dp),
+                horizontal = paddingValues.calculateStartPadding(LocalLayoutDirection.current)
+                    .coerceAtLeast(minimumValue = 8.dp),
+            ),
+            horizontalAlignment = Alignment.Start,
+            verticalArrangement = Arrangement.spacedBy(16.dp)
         ) {
-            Text(text = "Ticking: ", style = typography.subtitle1)
-            Switch(checked = ticking, onCheckedChange = { ticking = it })
-            Text(text = "Synced: ", style = typography.subtitle1)
-            Checkbox(checked = synced, onCheckedChange = null, enabled = false)
-        }
-        fun tick() {
-            systemTime = Clock.System.now()
-            networkTime = clockNetworkNowOrNull()
-            diff = networkTime?.let { it - systemTime }
-            Napier.d(tag = "⏳", message = "Ticking Diff: $diff")
-        }
-        if (ticking) {
-            LaunchedEffect(key1 = "tick") {
-                while (ticking) {
-                    tick()
-                    delay(1.seconds)
+            var networkTime: Instant? by remember { mutableStateOf(value = clockNetworkNowOrNull()) }
+            Text(text = "Network time:", style = typography.subtitle2)
+            Text(text = networkTime.toString(), style = typography.body1)
+            var systemTime: Instant by remember { mutableStateOf(Clock.System.now()) }
+            Text(text = "System time:", style = typography.subtitle2)
+            Text(
+                text = systemTime.toLocalDateTime(TimeZone.currentSystemDefault()).toString(),
+                style = typography.body1
+            )
+            var diff: Duration? by remember {
+                mutableStateOf(value = networkTime?.let { it - systemTime })
+            }
+            Text(text = "Diff:", style = typography.subtitle2)
+            Text(text = diff.toString(), style = typography.body1)
+            var ticking by remember { mutableStateOf(false) }
+            val synced by remember { derivedStateOf { networkTime != null } }
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                Text(text = "Ticking: ", style = typography.subtitle1)
+                Switch(checked = ticking, onCheckedChange = { ticking = it })
+                Text(text = "Synced: ", style = typography.subtitle1)
+                Checkbox(checked = synced, onCheckedChange = null, enabled = false)
+            }
+            fun tick() {
+                systemTime = Clock.System.now()
+                networkTime = clockNetworkNowOrNull()
+                diff = networkTime?.let { it - systemTime }
+                Napier.d(tag = "⏳", message = "Ticking Diff: $diff")
+            }
+            if (ticking) {
+                LaunchedEffect(key1 = "tick") {
+                    while (ticking) {
+                        tick()
+                        delay(1.seconds)
+                    }
                 }
             }
-        }
-        val loadingState: MutableState<Boolean> = remember { mutableStateOf(false) }
-        val coroutineScope = rememberCoroutineScope()
-        if (loadingState.value) {
-            CircularProgressIndicator()
-        } else {
-            Button(onClick = {
-                coroutineScope.launch {
-                    loadingState.value = true
-                    clickAwaitSync()
-                    tick()
-                    loadingState.value = false
+            val loadingState: MutableState<Boolean> = remember { mutableStateOf(false) }
+            val coroutineScope = rememberCoroutineScope()
+            if (loadingState.value) {
+                CircularProgressIndicator()
+            } else {
+                Button(onClick = {
+                    coroutineScope.launch {
+                        loadingState.value = true
+                        clickAwaitSync()
+                        tick()
+                        loadingState.value = false
+                    }
+                }) {
+                    Text(text = "Sync network time")
                 }
-            }) {
-                Text(text = "Sync network time")
+            }
+            Button(onClick = { openUrl("https://github.com/softartdev/Kronos-Multiplatform") }) {
+                Text("Open github")
             }
         }
-        Button(onClick = { openUrl("https://github.com/softartdev/Kronos-Multiplatform") }) {
-            Text("Open github")
-        }
-    }
-})
+    })
 
 private fun clockNetworkNowOrNull(): Instant? = try {
     Clock.Network.now()
diff --git a/sampleApp/src/desktopMain/kotlin/com/softartdev/kronos/sample/App.jvm.kt b/sampleApp/src/desktopMain/kotlin/com/softartdev/kronos/sample/App.jvm.kt
@@ -1,13 +1,16 @@
+@file:OptIn(ExperimentalTime::class)
+
 package com.softartdev.kronos.sample
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.runtime.Composable
 import com.softartdev.kronos.JvmNetworkClock
 import com.softartdev.kronos.Network
 import com.softartdev.kronos.sync
-import kotlinx.datetime.Clock
 import java.awt.Desktop
 import java.net.URI
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 internal actual fun openUrl(url: String?) {
     val uri = url?.let { URI.create(it) } ?: return
diff --git a/sampleApp/src/desktopMain/kotlin/main.kt b/sampleApp/src/desktopMain/kotlin/main.kt
diff --git a/sampleApp/src/iosMain/kotlin/com/softartdev/kronos/sample/App.ios.kt b/sampleApp/src/iosMain/kotlin/com/softartdev/kronos/sample/App.ios.kt
