Support Map<String, Any> for properties and traits. (#168)

* Support Map<String, Any> for properties and traits.

Co-authored-by: Wenxi Zeng <[email protected]>

Author: didiergarcia

android/build.gradle

@@ -6,15 +6,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 33
 
     defaultConfig {
         // Required when setting minSdkVersion to 20 or lower
         multiDexEnabled true
 
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode VERSION_CODE.toInteger()
         versionName VERSION_NAME
 
@@ -49,32 +48,32 @@ android {
 dependencies {
     // MAIN DEPS
     api project(':core')
-    api 'com.segment:sovran-kotlin:1.2.1'
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
-    implementation 'androidx.lifecycle:lifecycle-process:2.4.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.0'
+    api 'com.segment:sovran-kotlin:1.2.2'
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+    implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.1'
 
 
     // TESTING
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'
-    testImplementation 'io.mockk:mockk:1.10.6'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+    testImplementation 'io.mockk:mockk:1.12.2'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     // Add JUnit5 dependencies.
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
     // Add JUnit4 legacy dependencies.
     testImplementation 'junit:junit:4.13.2'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.2'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.8.2'
 
     // Add Roboelectric dependencies.
     testImplementation 'org.robolectric:robolectric:4.7.3'
-    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation 'androidx.test:core:1.5.0'
 }
 
 apply from: rootProject.file('gradle/artifacts-android.gradle')

android/src/main/java/com/segment/analytics/kotlin/android/plugins/AndroidLifecyclePlugin.kt

@@ -295,14 +295,12 @@ class AndroidLifecyclePlugin() : Application.ActivityLifecycleCallbacks, Default
                     // NO-OP
                 }
 
-                override fun getCurrentState(): State {
-                    return State.DESTROYED
-                }
+                override val currentState: State
+                    get() = State.DESTROYED
             }
 
-            override fun getLifecycle(): Lifecycle {
-                return stubLifecycle
-            }
+            override val lifecycle: Lifecycle
+                get() = stubLifecycle
         }
     }
 }

android/src/test/resources/robolectric.properties

@@ -0,0 +1 @@
+sdk=31

build.gradle

@@ -1,20 +1,20 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.6.0"
+    ext.kotlin_version = "1.8.0"
     ext.writeKey = "hAh3QxoRCsQsnyabTLMpWbpxoIN4O2mU"
     repositories {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 
         // needed for android unit tests
-        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1")
+        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.9.3.0")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.gms:google-services:4.3.15'
     }
 }
 

core/build.gradle

@@ -24,13 +24,13 @@ test {
 dependencies {
     // MAIN DEPS
     api 'com.segment:sovran-kotlin:1.2.2'
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
 
     // TESTING
     repositories { mavenCentral() }
     testImplementation 'io.mockk:mockk:1.10.6'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
     testImplementation platform("org.junit:junit-bom:5.7.2")
     testImplementation "org.junit.jupiter:junit-jupiter"

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

@@ -9,14 +9,13 @@ import com.segment.analytics.kotlin.core.platform.plugins.SegmentDestination
 import com.segment.analytics.kotlin.core.platform.plugins.StartupQueue
 import com.segment.analytics.kotlin.core.platform.plugins.UserInfoPlugin
 import com.segment.analytics.kotlin.core.platform.plugins.logger.*
+import com.segment.analytics.kotlin.core.utilities.JsonAnySerializer
 import kotlinx.coroutines.*
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.Json.Default.decodeFromJsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.serializer
 import sovran.kotlin.Store
 import sovran.kotlin.Subscriber
 import java.util.*
@@ -99,11 +98,11 @@ open class Analytics protected constructor(
                 )
             }
             override val analyticsScope = CoroutineScope(SupervisorJob() + exceptionHandler)
-            override val analyticsDispatcher : CloseableCoroutineDispatcher =
+            override val analyticsDispatcher: CloseableCoroutineDispatcher =
                 Executors.newCachedThreadPool().asCoroutineDispatcher()
-            override val networkIODispatcher : CloseableCoroutineDispatcher =
+            override val networkIODispatcher: CloseableCoroutineDispatcher =
                 Executors.newSingleThreadExecutor().asCoroutineDispatcher()
-            override val fileIODispatcher : CloseableCoroutineDispatcher =
+            override val fileIODispatcher: CloseableCoroutineDispatcher =
                 Executors.newFixedThreadPool(2).asCoroutineDispatcher()
         })
 
@@ -161,7 +160,7 @@ open class Analytics protected constructor(
      * @param serializationStrategy strategy to serialize [properties]
      * @see <a href="https://segment.com/docs/spec/track/">Track Documentation</a>
      */
-    fun <T : Any> track(
+    fun <T> track(
         name: String,
         properties: T,
         serializationStrategy: SerializationStrategy<T>,
@@ -178,11 +177,11 @@ open class Analytics protected constructor(
      * @param properties to describe the action. Needs to be [serializable](https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md)
      * @see <a href="https://segment.com/docs/spec/track/">Track Documentation</a>
      */
-    inline fun <reified T : Any> track(
+    inline fun <reified T> track(
         name: String,
         properties: T,
     ) {
-        track(name, properties, Json.serializersModule.serializer())
+        track(name, properties, JsonAnySerializer.serializersModule.serializer())
     }
 
     /**
@@ -227,7 +226,7 @@ open class Analytics protected constructor(
      * @param serializationStrategy strategy to serialize [traits]
      * @see <a href="https://segment.com/docs/spec/identify/">Identify Documentation</a>
      */
-    fun <T : Any> identify(
+    fun <T> identify(
         userId: String,
         traits: T,
         serializationStrategy: SerializationStrategy<T>,
@@ -250,10 +249,10 @@ open class Analytics protected constructor(
      * @param traits [Traits] about the user. Needs to be [serializable](https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md)
      * @see <a href="https://segment.com/docs/spec/identify/">Identify Documentation</a>
      */
-    inline fun <reified T : Any> identify(
+    inline fun <reified T> identify(
         traits: T,
     ) {
-        identify(traits, Json.serializersModule.serializer())
+        identify(traits, JsonAnySerializer.serializersModule.serializer())
     }
 
     /**
@@ -298,7 +297,7 @@ open class Analytics protected constructor(
      * @param serializationStrategy strategy to serialize [traits]
      * @see <a href="https://segment.com/docs/spec/identify/">Identify Documentation</a>
      */
-    fun <T : Any> identify(
+    fun <T> identify(
         traits: T,
         serializationStrategy: SerializationStrategy<T>,
     ) {
@@ -321,11 +320,11 @@ open class Analytics protected constructor(
      * @param traits [Traits] about the user. Needs to be [serializable](https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md)
      * @see <a href="https://segment.com/docs/spec/identify/">Identify Documentation</a>
      */
-    inline fun <reified T : Any> identify(
+    inline fun <reified T> identify(
         userId: String,
         traits: T,
     ) {
-        identify(userId, traits, Json.serializersModule.serializer())
+        identify(userId, traits, JsonAnySerializer.serializersModule.serializer())
     }
 
     /**
@@ -359,7 +358,7 @@ open class Analytics protected constructor(
      * @param serializationStrategy strategy to serialize [properties]
      * @see <a href="https://segment.com/docs/spec/screen/">Screen Documentation</a>
      */
-    fun <T : Any> screen(
+    fun <T> screen(
         title: String,
         properties: T,
         serializationStrategy: SerializationStrategy<T>,
@@ -382,12 +381,12 @@ open class Analytics protected constructor(
      * @param properties [Properties] to add extra information to this call. Needs to be [serializable](https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md)
      * @see <a href="https://segment.com/docs/spec/screen/">Screen Documentation</a>
      */
-    inline fun <reified T : Any> screen(
+    inline fun <reified T> screen(
         title: String,
         properties: T,
         category: String = "",
     ) {
-        screen(title, properties, Json.serializersModule.serializer(), category)
+        screen(title, properties, JsonAnySerializer.serializersModule.serializer(), category)
     }
 
     /**
@@ -419,7 +418,7 @@ open class Analytics protected constructor(
      * @param serializationStrategy strategy to serialize [traits]
      * @see <a href="https://segment.com/docs/spec/group/">Group Documentation</a>
      */
-    fun <T : Any> group(
+    fun <T> group(
         groupId: String,
         traits: T,
         serializationStrategy: SerializationStrategy<T>,
@@ -438,11 +437,11 @@ open class Analytics protected constructor(
      * @param traits [Traits] about the group. Needs to be [serializable](https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md)
      * @see <a href="https://segment.com/docs/spec/group/">Group Documentation</a>
      */
-    inline fun <reified T : Any> group(
+    inline fun <reified T> group(
         groupId: String,
         traits: T,
     ) {
-        group(groupId, traits, Json.serializersModule.serializer())
+        group(groupId, traits, JsonAnySerializer.serializersModule.serializer())
     }
 
     /**
@@ -613,7 +612,7 @@ open class Analytics protected constructor(
     /**
      * Retrieve the traits registered by a previous `identify` call in a blocking way.
      */
-    inline fun <reified T : Any> traits(deserializationStrategy: DeserializationStrategy<T> = Json.serializersModule.serializer()): T? {
+    inline fun <reified T> traits(deserializationStrategy: DeserializationStrategy<T> = Json.serializersModule.serializer()): T? {
         return traits()?.let {
             decodeFromJsonElement(deserializationStrategy, it)
         }
@@ -626,7 +625,7 @@ open class Analytics protected constructor(
         "This function no longer serves a purpose and internally calls `traits(deserializationStrategy: DeserializationStrategy<T>)`.",
         ReplaceWith("traits(deserializationStrategy: DeserializationStrategy<T>)")
     )
-    inline fun <reified T : Any> traitsAsync(deserializationStrategy: DeserializationStrategy<T> = Json.serializersModule.serializer()): T? {
+    inline fun <reified T> traitsAsync(deserializationStrategy: DeserializationStrategy<T> = Json.serializersModule.serializer()): T? {
         return traits(deserializationStrategy)
     }