Move Config to use Instant

Author: Daeda88

firebase-config/api/android/firebase-config.api

@@ -25,15 +25,15 @@ public final class dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig {
 }
 
 public final class dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo {
-	public synthetic fun <init> (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;JLdev/gitlive/firebase/remoteconfig/FetchStatus;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;)V
 	public final fun component1 ()Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;
-	public final fun component2-UwyO8pc ()J
+	public final fun component2 ()Lkotlinx/datetime/Instant;
 	public final fun component3 ()Ldev/gitlive/firebase/remoteconfig/FetchStatus;
-	public final fun copy-8Mi8wO0 (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;JLdev/gitlive/firebase/remoteconfig/FetchStatus;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
-	public static synthetic fun copy-8Mi8wO0$default (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;JLdev/gitlive/firebase/remoteconfig/FetchStatus;ILjava/lang/Object;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
+	public final fun copy (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
+	public static synthetic fun copy$default (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;ILjava/lang/Object;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getConfigSettings ()Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;
-	public final fun getFetchTime-UwyO8pc ()J
+	public final fun getFetchTime ()Lkotlinx/datetime/Instant;
 	public final fun getFetchTimeMillis ()J
 	public final fun getLastFetchStatus ()Ldev/gitlive/firebase/remoteconfig/FetchStatus;
 	public fun hashCode ()I

firebase-config/api/jvm/firebase-config.api

@@ -25,15 +25,15 @@ public final class dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig {
 }
 
 public final class dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo {
-	public synthetic fun <init> (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;JLdev/gitlive/firebase/remoteconfig/FetchStatus;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;)V
 	public final fun component1 ()Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;
-	public final fun component2-UwyO8pc ()J
+	public final fun component2 ()Lkotlinx/datetime/Instant;
 	public final fun component3 ()Ldev/gitlive/firebase/remoteconfig/FetchStatus;
-	public final fun copy-8Mi8wO0 (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;JLdev/gitlive/firebase/remoteconfig/FetchStatus;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
-	public static synthetic fun copy-8Mi8wO0$default (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;JLdev/gitlive/firebase/remoteconfig/FetchStatus;ILjava/lang/Object;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
+	public final fun copy (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
+	public static synthetic fun copy$default (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;ILjava/lang/Object;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getConfigSettings ()Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;
-	public final fun getFetchTime-UwyO8pc ()J
+	public final fun getFetchTime ()Lkotlinx/datetime/Instant;
 	public final fun getFetchTimeMillis ()J
 	public final fun getLastFetchStatus ()Ldev/gitlive/firebase/remoteconfig/FetchStatus;
 	public fun hashCode ()I

firebase-config/build.gradle.kts

@@ -29,6 +29,7 @@ android {
     }
 
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
@@ -44,6 +45,10 @@ android {
     }
 }
 
+dependencies {
+    coreLibraryDesugaring(libs.android.desugarjdk)
+}
+
 val supportIosTarget = project.property("skipIosTarget") != "true"
 
 kotlin {
@@ -120,6 +125,7 @@ kotlin {
             dependencies {
                 api(project(":firebase-app"))
                 implementation(project(":firebase-common"))
+                api(libs.kotlinx.datetime)
             }
         }
 

firebase-config/src/androidMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -8,8 +8,8 @@ import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import kotlinx.coroutines.tasks.await
+import kotlinx.datetime.Instant
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig as AndroidFirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo as AndroidFirebaseRemoteConfigInfo
@@ -31,8 +31,8 @@ public actual class FirebaseRemoteConfig internal constructor(public val android
     public actual suspend fun settings(init: FirebaseRemoteConfigSettings.() -> Unit) {
         val settings = FirebaseRemoteConfigSettings().apply(init)
         val androidSettings = com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder()
-            .setMinimumFetchIntervalInSeconds(settings.minimumFetchIntervalInSeconds)
-            .setFetchTimeoutInSeconds(settings.fetchTimeoutInSeconds)
+            .setMinimumFetchIntervalInSeconds(settings.minimumFetchInterval.inWholeSeconds)
+            .setFetchTimeoutInSeconds(settings.fetchTimeout.inWholeSeconds)
             .build()
         android.setConfigSettingsAsync(androidSettings).await()
     }
@@ -74,7 +74,7 @@ public actual class FirebaseRemoteConfig internal constructor(public val android
 
         return FirebaseRemoteConfigInfo(
             configSettings = configSettings.asCommon(),
-            fetchTime = fetchTimeMillis.milliseconds,
+            fetchTime = Instant.fromEpochMilliseconds(fetchTimeMillis),
             lastFetchStatus = lastFetchStatus,
         )
     }

firebase-config/src/commonMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo.kt

@@ -1,6 +1,6 @@
 package dev.gitlive.firebase.remoteconfig
 
-import kotlin.time.Duration
+import kotlinx.datetime.Instant
 
 /** Wraps the current state of the [FirebaseRemoteConfig] singleton object. */
 public data class FirebaseRemoteConfigInfo(
@@ -12,13 +12,13 @@ public data class FirebaseRemoteConfigInfo(
     val configSettings: FirebaseRemoteConfigSettings,
 
     /**
-     * Gets the timestamp ([Duration] since epoch) of the last successful fetch, regardless of
+     * Gets the [Instant] of the last successful fetch, regardless of
      * whether the fetch was activated or not.
      *
-     * @return `-1.milliseconds` if no fetch attempt has been made yet. Otherwise, returns the timestamp of the last
+     * @return `Instant.fromEpochMilliseconds(-1)` if no fetch attempt has been made yet. Otherwise, returns the timestamp of the last
      *     successful fetch operation.
      */
-    val fetchTime: Duration,
+    val fetchTime: Instant,
 
     /**
      * Gets the status of the most recent fetch attempt.
@@ -28,7 +28,7 @@ public data class FirebaseRemoteConfigInfo(
     val lastFetchStatus: FetchStatus,
 ) {
     @Deprecated("Replaced with Kotlin Duration", replaceWith = ReplaceWith("fetchTime"))
-    val fetchTimeMillis: Long get() = fetchTime.inWholeMilliseconds
+    val fetchTimeMillis: Long get() = fetchTime.toEpochMilliseconds()
 }
 
 public enum class FetchStatus {

firebase-config/src/commonTest/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -9,12 +9,12 @@ import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.runTest
+import kotlinx.datetime.Instant
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
@@ -104,7 +104,7 @@ class FirebaseRemoteConfigTest {
         assertEquals(
             FirebaseRemoteConfigInfo(
                 configSettings = FirebaseRemoteConfigSettings(),
-                fetchTime = (-1).milliseconds,
+                fetchTime = Instant.fromEpochMilliseconds(-1),
                 lastFetchStatus = FetchStatus.NoFetchYet,
             ).toString(),
             remoteConfig.info.toString(),

firebase-config/src/iosMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -13,10 +13,10 @@ import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.FirebaseException
 import dev.gitlive.firebase.app
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.datetime.Instant
+import kotlinx.datetime.toKotlinInstant
 import platform.Foundation.NSError
-import platform.Foundation.timeIntervalSince1970
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.DurationUnit
 
@@ -45,10 +45,9 @@ public actual class FirebaseRemoteConfig internal constructor(public val ios: FI
         get() {
             return FirebaseRemoteConfigInfo(
                 configSettings = ios.configSettings.asCommon(),
-                fetchTime = ios.lastFetchTime
-                    ?.timeIntervalSince1970?.seconds
-                    ?.takeIf { it > Duration.ZERO }
-                    ?: (-1L).milliseconds,
+                fetchTime = ios.lastFetchTime?.toKotlinInstant()
+                    ?.takeIf { it.toEpochMilliseconds() > 0 }
+                    ?: Instant.fromEpochMilliseconds(-1),
                 lastFetchStatus = ios.lastFetchStatus.asCommon(),
             )
         }

firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -5,6 +5,7 @@ import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.FirebaseException
 import dev.gitlive.firebase.remoteconfig.externals.*
 import kotlinx.coroutines.await
+import kotlinx.datetime.Instant
 import kotlin.js.json
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
@@ -24,7 +25,7 @@ public actual class FirebaseRemoteConfig internal constructor(public val js: Rem
         get() = rethrow {
             FirebaseRemoteConfigInfo(
                 configSettings = js.settings.toFirebaseRemoteConfigSettings(),
-                fetchTime = js.fetchTimeMillis.milliseconds,
+                fetchTime = Instant.fromEpochMilliseconds(js.fetchTimeMillis.toLong()),
                 lastFetchStatus = js.lastFetchStatus.toFetchStatus(),
             )
         }

gradle/libs.versions.toml

@@ -12,12 +12,14 @@ kotlin = "2.0.0"
 kotlinx-coroutines = "1.9.0-RC"
 kotlinx-serialization = "1.7.0"
 kotlinx-binarycompatibilityvalidator = "0.15.0-Beta.2"
+kotlinx-datetime = "0.6.0"
 kotlinter = "4.4.0"
 settings-api = "2.0"
 settings-language = "2.0"
 firebase-cocoapods = "10.28.0"
 test-logger-plugin = "3.2.0"
 dokka = "1.9.20"
+desugar-libs = "2.0.3"
 
 [libraries]
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
@@ -45,7 +47,9 @@ kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-cor
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
 dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" }
+android-desugarjdk = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar-libs" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }