Refactor to support JVM (#13)

* move around modules, and add core-kotlin module

* move context around, fix storage for jvm

* add kotlin JVM sample app

* rename module

* rename packages

* fix core tests

* fix android tests

* fix example app

* fix example apps

* code cleanup

* fix some docs and rename test to tests

* add documentation

* clarify main.kt

* move around some code

* rename modules

* fix conflicts after rebase from master and fix wildcard imports

* fix tests

Author: prayansh

analytics-kotlin/src/test/java/com/segment/analytics/main/utils/Mocks.kt

@@ -45,7 +45,8 @@ android {
 
 dependencies {
     // MAIN DEPS
-    api project(":sovran-kotlin")
+    api project(':core')
+    api 'com.github.segmentio:sovran-kotlin:0.1.0'
     api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'

analytics-kotlin/src/test/java/com/segment/analytics/main/utils/Utils.kt

@@ -1,11 +1,14 @@
-package com.segment.analytics
+package com.segment.analytics.kotlin.android
 
 import android.content.Context
 import android.util.Log
-import com.segment.analytics.platform.plugins.LogType
-import com.segment.analytics.platform.plugins.Logger
-import com.segment.analytics.platform.plugins.android.AndroidContextPlugin
-import com.segment.analytics.platform.plugins.android.AndroidLifecyclePlugin
+import com.segment.analytics.kotlin.android.plugins.AndroidContextPlugin
+import com.segment.analytics.kotlin.android.plugins.AndroidLifecyclePlugin
+import com.segment.analytics.kotlin.core.Analytics
+import com.segment.analytics.kotlin.core.BaseEvent
+import com.segment.analytics.kotlin.core.Configuration
+import com.segment.analytics.kotlin.core.platform.plugins.LogType
+import com.segment.analytics.kotlin.core.platform.plugins.Logger
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -31,7 +34,8 @@ public fun Analytics(
         analyticsScope = coroutineScope,
         analyticsDispatcher = analyticsDispatcher,
         ioDispatcher = ioDispatcher,
-        application = context
+        application = context,
+        storageProvider = AndroidStorageProvider
     )
     return Analytics(conf).apply {
         startup()
@@ -53,7 +57,8 @@ public fun Analytics(
     require(writeKey.isNotBlank()) { "writeKey cannot be blank " }
     val conf = Configuration(
         writeKey = writeKey,
-        application = context
+        application = context,
+        storageProvider = AndroidStorageProvider
     )
     configs.invoke(conf)
     return Analytics(conf).apply {
@@ -62,7 +67,7 @@ public fun Analytics(
 }
 
 // Logger instance that uses the android `Log` class
-object AndroidLogger: Logger("AndroidLogger") {
+object AndroidLogger : Logger("AndroidLogger") {
     override fun log(type: LogType, message: String, event: BaseEvent?) {
         when (type) {
             LogType.ERROR -> {
@@ -84,6 +89,5 @@ object AndroidLogger: Logger("AndroidLogger") {
 private fun Analytics.startup() {
     add(AndroidLogger)
     add(AndroidContextPlugin())
-
     add(AndroidLifecyclePlugin())
 }

analytics-kotlin/.gitignore renamed to android/.gitignore

@@ -1,73 +1,20 @@
-package com.segment.analytics
+package com.segment.analytics.kotlin.android
 
 import android.content.Context
 import android.content.SharedPreferences
-import com.segment.analytics.Storage.Companion.MAX_PAYLOAD_SIZE
-import com.segment.analytics.utilities.EventsFileManager
+import com.segment.analytics.kotlin.android.utilities.AndroidKVS
+import com.segment.analytics.kotlin.core.Analytics
+import com.segment.analytics.kotlin.core.Storage
+import com.segment.analytics.kotlin.core.Storage.Companion.MAX_PAYLOAD_SIZE
+import com.segment.analytics.kotlin.core.StorageProvider
+import com.segment.analytics.kotlin.core.System
+import com.segment.analytics.kotlin.core.UserInfo
+import com.segment.analytics.kotlin.core.utilities.EventsFileManager
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
 import sovran.kotlin.Store
 import sovran.kotlin.Subscriber
 import java.io.File
 
-interface Storage {
-    companion object {
-        /** Our servers only accept payloads < 32KB.  */
-        const val MAX_PAYLOAD_SIZE = 32000 // 32KB.
-
-        /**
-         * Our servers only accept batches < 500KB. This limit is 475KB to account for extra data that
-         * is not present in payloads themselves, but is added later, such as `sentAt`, `integrations` and other json tokens.
-         */
-        const val MAX_BATCH_SIZE = 475000 // 475KB.
-    }
-
-    enum class Constants(val rawVal: String) {
-        UserId("segment.userId"),
-        Traits("segment.traits"),
-        AnonymousId("segment.anonymousId"),
-        Settings("segment.settings"),
-        Events("segment.events"),
-        AppVersion("segment.app.version"),
-        AppBuild("segment.app.build")
-    }
-
-    fun subscribeToStore()
-    fun write(key: Constants, value: String)
-    fun read(key: Constants): String?
-    fun remove(key: Constants): Boolean
-    fun removeFile(filePath: String): Boolean
-
-    fun userInfoUpdate(userInfo: UserInfo) {
-        write(Constants.AnonymousId, userInfo.anonymousId)
-        userInfo.userId?.let { write(Constants.UserId, it) }
-        userInfo.traits?.let {
-            write(
-                Constants.Traits,
-                Json.encodeToString(JsonObject.serializer(), it)
-            )
-        }
-    }
-
-    fun systemUpdate(system: System) {
-        system.settings?.let {
-            write(
-                Constants.Settings,
-                Json.encodeToString(Settings.serializer(), it)
-            )
-        }
-    }
-}
-
-fun parseFilePaths(filePathStr: String?): List<String> {
-    return if (filePathStr.isNullOrEmpty()) {
-        emptyList()
-    } else {
-        filePathStr.split(",").map { it.trim() }
-    }
-}
-
 // Android specific
 class AndroidStorage(
     internal val analytics: Analytics,
@@ -80,7 +27,8 @@ class AndroidStorage(
     private val sharedPreferences: SharedPreferences =
         context.getSharedPreferences("analytics-android-$writeKey", Context.MODE_PRIVATE)
     private val storageDirectory: File = context.getDir("segment-disk-queue", Context.MODE_PRIVATE)
-    internal val eventsFile = EventsFileManager(storageDirectory, writeKey, sharedPreferences)
+    internal val eventsFile =
+        EventsFileManager(storageDirectory, writeKey, AndroidKVS(sharedPreferences))
 
     override fun subscribeToStore() {
         store.subscribe(
@@ -147,17 +95,7 @@ class AndroidStorage(
     }
 }
 
-interface StorageProvider {
-    fun getStorage(
-        analytics: Analytics,
-        store: Store,
-        writeKey: String,
-        ioDispatcher: CoroutineDispatcher,
-        application: Any
-    ): Storage
-}
-
-object ConcreteStorageProvider: StorageProvider {
+object AndroidStorageProvider : StorageProvider {
     override fun getStorage(
         analytics: Analytics,
         store: Store,

analytics-kotlin/build.gradle renamed to android/build.gradle

@@ -1,21 +1,29 @@
-package com.segment.analytics.platform.plugins.android
+package com.segment.analytics.kotlin.android.plugins
 
 import android.Manifest.permission
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
-import android.net.NetworkCapabilities.*
+import android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH
+import android.net.NetworkCapabilities.TRANSPORT_CELLULAR
+import android.net.NetworkCapabilities.TRANSPORT_WIFI
 import android.os.Build
 import android.provider.Settings.Secure
 import android.telephony.TelephonyManager
-import com.segment.analytics.*
-import com.segment.analytics.platform.EventPlugin
-import com.segment.analytics.platform.Plugin
-import com.segment.analytics.utilities.putAll
-import com.segment.analytics.utilities.putUndefinedIfNull
-import kotlinx.serialization.json.*
-import java.util.*
+import com.segment.analytics.kotlin.core.Analytics
+import com.segment.analytics.kotlin.core.BaseEvent
+import com.segment.analytics.kotlin.core.Storage
+import com.segment.analytics.kotlin.core.emptyJsonObject
+import com.segment.analytics.kotlin.core.platform.Plugin
+import com.segment.analytics.kotlin.core.utilities.putAll
+import com.segment.analytics.kotlin.core.utilities.putUndefinedIfNull
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import java.util.Locale
+import java.util.TimeZone
+import java.util.UUID
 import java.lang.System as JavaSystem
 
 // Plugin that applies context related changes. Auto-added to system on build
@@ -30,7 +38,6 @@ class AndroidContextPlugin : Plugin {
     private lateinit var app: JsonObject
     private lateinit var os: JsonObject
     private lateinit var device: JsonObject
-    private lateinit var library: JsonObject
     private lateinit var screen: JsonObject
 
     companion object {
@@ -53,11 +60,6 @@ class AndroidContextPlugin : Plugin {
         const val DEVICE_NAME_KEY = "name"
         const val DEVICE_TYPE_KEY = "type"
 
-        // Library
-        const val LIBRARY_KEY = "library"
-        const val LIBRARY_NAME_KEY = "name"
-        const val LIBRARY_VERSION_KEY = "version"
-
         // Network
         const val NETWORK_KEY = "network"
         const val NETWORK_BLUETOOTH_KEY = "bluetooth"
@@ -89,11 +91,6 @@ class AndroidContextPlugin : Plugin {
             put(OS_VERSION_KEY, Build.VERSION.RELEASE)
         }
 
-        library = buildJsonObject {
-            put(LIBRARY_NAME_KEY, "analytics-kotlin")
-            put(LIBRARY_VERSION_KEY, BuildConfig.SEGMENT_VERSION_NAME)
-        }
-
         screen = buildJsonObject {
             val displayMetrics = context.resources.displayMetrics
 
@@ -188,9 +185,6 @@ class AndroidContextPlugin : Plugin {
             // putApp
             put(APP_KEY, app)
 
-            // putLibrary
-            put(LIBRARY_KEY, library)
-
             // putDevice
             put(DEVICE_KEY, device)