Remove Desugaring Requirement By Removing Instant.now() (#154)

* Remove use of Instant.now() replace with older API.

Author: didiergarcia

android/build.gradle

@@ -32,9 +32,6 @@ android {
         }
     }
     compileOptions {
-        // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
-
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -59,7 +56,6 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-process:2.4.0'
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.0'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
     // TESTING
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'

android/src/test/java/com/segment/analytics/kotlin/android/EventsFileTests.kt

@@ -6,6 +6,7 @@ import com.segment.analytics.kotlin.core.TrackEvent
 import com.segment.analytics.kotlin.core.emptyJsonObject
 import com.segment.analytics.kotlin.core.utilities.EncodeDefaultsJson
 import com.segment.analytics.kotlin.core.utilities.EventsFileManager
+import com.segment.analytics.kotlin.core.utilities.dateTimeNowString
 import io.mockk.every
 import io.mockk.mockkStatic
 import kotlinx.coroutines.test.runTest
@@ -32,6 +33,8 @@ class EventsFileTests {
 
     init {
         mockkStatic(Instant::class)
+        mockkStatic(::dateTimeNowString)
+        every { dateTimeNowString() } returns Date(0).toInstant().toString()
         every { Instant.now() } returns Date(0).toInstant()
     }
 

core/src/main/java/com/segment/analytics/kotlin/core/Events.kt

@@ -1,16 +1,11 @@
 package com.segment.analytics.kotlin.core
 
+import com.segment.analytics.kotlin.core.utilities.dateTimeNowString
 import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.*
 import sovran.kotlin.Store
-import java.time.Instant
 import java.util.*
 
 typealias AnalyticsContext = JsonObject
@@ -21,18 +16,6 @@ typealias Traits = JsonObject
 val emptyJsonObject = JsonObject(emptyMap())
 val emptyJsonArray = JsonArray(emptyList())
 
-class DateSerializer : KSerializer<Instant> {
-    override val descriptor = PrimitiveSerialDescriptor("Instant", PrimitiveKind.STRING)
-
-    override fun deserialize(decoder: Decoder): Instant {
-        return Instant.parse(decoder.decodeString())
-    }
-
-    override fun serialize(encoder: Encoder, value: Instant) {
-        encoder.encodeString(value.toString())
-    }
-}
-
 @Serializable
 data class DestinationMetadata(
     var bundled: List<String>? = emptyList(),
@@ -97,7 +80,7 @@ sealed class BaseEvent {
     }
 
     internal fun applyBaseData() {
-        this.timestamp = Instant.now().toString()
+        this.timestamp = dateTimeNowString()
         this.context = emptyJsonObject
         this.messageId = UUID.randomUUID().toString()
     }

core/src/main/java/com/segment/analytics/kotlin/core/utilities/DateTimeUtils.kt

@@ -0,0 +1,19 @@
+package com.segment.analytics.kotlin.core.utilities
+
+import java.text.SimpleDateFormat
+import java.util.*
+
+/**
+ * This function is a replacement for Instant.now().toString(). It produces strings in a
+ * compatible format.
+ *
+ * Ex:
+ * Instant.now():       2023-04-19T04:03:46.880969Z
+ * dateTimeNowString(): 2023-04-19T04:03:46.880Z
+ */
+fun dateTimeNowString(): String {
+    val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'.'Szzz")
+    val utc = TimeZone.getTimeZone("UTC");
+    sdf.timeZone = utc;
+    return sdf.format(Date()).replace("UTC", "Z")
+}

core/src/main/java/com/segment/analytics/kotlin/core/utilities/EventsFileManager.kt

@@ -3,7 +3,6 @@ package com.segment.analytics.kotlin.core.utilities
 import kotlinx.coroutines.sync.Semaphore
 import java.io.File
 import java.io.FileOutputStream
-import java.time.Instant
 
 /**
  * Responsible for storing events in a batch payload style
@@ -134,7 +133,9 @@ class EventsFileManager(
             return
         }
         // close events array and batch object
-        val contents = """],"sentAt":"${Instant.now()}","writeKey":"$writeKey"}"""
+
+
+        val contents = """],"sentAt":"${dateTimeNowString()}","writeKey":"$writeKey"}"""
         writeToFile(contents.toByteArray(), file)
         file.renameTo(File(directory, file.nameWithoutExtension))
         os?.close()

core/src/test/kotlin/com/segment/analytics/kotlin/core/AnalyticsTests.kt

@@ -3,6 +3,7 @@ package com.segment.analytics.kotlin.core
 import com.segment.analytics.kotlin.core.platform.DestinationPlugin
 import com.segment.analytics.kotlin.core.platform.Plugin
 import com.segment.analytics.kotlin.core.platform.plugins.ContextPlugin
+import com.segment.analytics.kotlin.core.utilities.dateTimeNowString
 import com.segment.analytics.kotlin.core.utils.StubPlugin
 import com.segment.analytics.kotlin.core.utils.TestRunPlugin
 import com.segment.analytics.kotlin.core.utils.clearPersistentStorage
@@ -56,6 +57,8 @@ class AnalyticsTests {
     init {
         mockkStatic(Instant::class)
         every { Instant.now() } returns Date(0).toInstant()
+        mockkStatic(::dateTimeNowString)
+        every { dateTimeNowString() } returns Date(0).toInstant().toString()
         mockkStatic(UUID::class)
         every { UUID.randomUUID().toString() } returns "qwerty-qwerty-123"
     }

core/src/test/kotlin/com/segment/analytics/kotlin/core/DateSerializerTests.kt

@@ -15,6 +15,7 @@ import com.segment.analytics.kotlin.core.emptyJsonObject
 import com.segment.analytics.kotlin.core.platform.DestinationPlugin
 import com.segment.analytics.kotlin.core.platform.Plugin
 import com.segment.analytics.kotlin.core.platform.plugins.ContextPlugin
+import com.segment.analytics.kotlin.core.utilities.dateTimeNowString
 import com.segment.analytics.kotlin.core.utils.StubPlugin
 import com.segment.analytics.kotlin.core.utils.TestRunPlugin
 import com.segment.analytics.kotlin.core.utils.mockHTTPClient
@@ -62,6 +63,8 @@ internal class JavaAnalyticsTest {
     init {
         mockkStatic(Instant::class)
         every { Instant.now() } returns Date(0).toInstant()
+        mockkStatic(::dateTimeNowString)
+        every { dateTimeNowString() } returns Date(0).toInstant().toString()
         mockkStatic(UUID::class)
         every { UUID.randomUUID().toString() } returns "qwerty-qwerty-123"
         mockHTTPClient()

core/src/test/kotlin/com/segment/analytics/kotlin/core/compat/JavaAnalyticsTest.kt

@@ -26,6 +26,9 @@ internal class EventsFileManagerTest{
     init {
         mockkStatic(Instant::class)
         every { Instant.now() } returns Date(0).toInstant()
+
+        mockkStatic(::dateTimeNowString)
+        every { dateTimeNowString() } returns Date(0).toInstant().toString()
     }
 
     @BeforeEach