Merge pull request #3 from segment-integrations/wenxi/fix-package-collision

fix package collision

Author: wenxi-zeng

README.md

@@ -23,7 +23,7 @@ implementation("com.segment.analytics.kotlin.destinations:amplitude:1.4.4")
 Open the file where you setup and configure the Analytics-Kotlin library.  Add this plugin to the list of imports.
 
 ```
-import com.segment.analytics.kotlin.destinations.plugins.AmplitudeSession
+import com.segment.analytics.kotlin.destinations.amplitude.AmplitudeSession
 ```
 
 Just under your Analytics-Kotlin library setup, call `analytics.add(plugin = ...)` to add an instance of the plugin to the Analytics timeline.

lib/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
     id("mvn-publish")
 }
 
+val VERSION_NAME: String by project
+
 android {
     compileSdk = 31
     buildToolsVersion = "31.0.0"
@@ -17,6 +19,8 @@ android {
 
         testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("proguard-consumer-rules.pro")
+
+        buildConfigField("String", "VERSION_NAME", "\"$VERSION_NAME\"")
     }
 
     buildTypes {
@@ -38,7 +42,7 @@ android {
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
 
-    implementation("com.segment.analytics.kotlin:android:1.4.3")
+    implementation("com.segment.analytics.kotlin:android:1.5.0")
     implementation("androidx.multidex:multidex:2.0.1")
 
     implementation("androidx.core:core-ktx:1.7.0")

…tions/plugins/ExampleInstrumentedTest.kt …ons/amplitude/ExampleInstrumentedTest.ktlib/src/androidTest/java/com/segment/analytics/kotlin/destinations/plugins/ExampleInstrumentedTest.kt renamed to lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/amplitude/ExampleInstrumentedTest.kt lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/plugins/ExampleInstrumentedTest.kt renamed to lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/amplitude/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
-package com.segment.analytics.kotlin.destinations.plugins
+package com.segment.analytics.kotlin.destinations.amplitude
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-
+import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -19,6 +17,9 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.segment.analytics.kotlin.destinations.plugins.test", appContext.packageName)
+        Assert.assertEquals(
+            "com.segment.analytics.kotlin.destinations.amplitude.test",
+            appContext.packageName
+        )
     }
 }

lib/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.segment.analytics.kotlin.destinations.plugins">
+          package="com.segment.analytics.kotlin.destinations.amplitude">
 
 </manifest>

…destinations/plugins/AmplitudeSession.kt …stinations/amplitude/AmplitudeSession.ktlib/src/main/java/com/segment/analytics/kotlin/destinations/plugins/AmplitudeSession.kt renamed to lib/src/main/java/com/segment/analytics/kotlin/destinations/amplitude/AmplitudeSession.kt lib/src/main/java/com/segment/analytics/kotlin/destinations/plugins/AmplitudeSession.kt renamed to lib/src/main/java/com/segment/analytics/kotlin/destinations/amplitude/AmplitudeSession.kt

@@ -1,14 +1,16 @@
-package com.segment.analytics.kotlin.destinations.plugins
+package com.segment.analytics.kotlin.destinations.amplitude
 
 import com.segment.analytics.kotlin.core.*
 import com.segment.analytics.kotlin.core.platform.Plugin
-import com.segment.analytics.kotlin.core.platform.plugins.logger.*
+import com.segment.analytics.kotlin.core.platform.VersionedPlugin
+import com.segment.analytics.kotlin.core.platform.plugins.logger.LogFilterKind
+import com.segment.analytics.kotlin.core.platform.plugins.logger.log
 import com.segment.analytics.kotlin.core.utilities.putIntegrations
 import java.util.*
 import kotlin.concurrent.schedule
 
 // A Destination plugin that adds session tracking to Amplitude cloud mode.
-class AmplitudeSession : Plugin {
+class AmplitudeSession : Plugin, VersionedPlugin {
 
     override val type: Plugin.Type = Plugin.Type.Enrichment
     override lateinit var analytics: Analytics
@@ -19,7 +21,7 @@ class AmplitudeSession : Plugin {
     private var timer: TimerTask? = null
     private val fireTime: Long = 300000
 
-    override fun update(settings: Settings, type:Plugin.UpdateType) {
+    override fun update(settings: Settings, type: Plugin.UpdateType) {
         active = settings.hasIntegrationSettings(key)
     }
 
@@ -116,4 +118,8 @@ class AmplitudeSession : Plugin {
         timer?.cancel()
         sessionID = -1
     }
-}
+
+    override fun version(): String {
+        return BuildConfig.VERSION_NAME
+    }
+}

…/destinations/plugins/ExampleUnitTest.kt …estinations/amplitude/ExampleUnitTest.ktlib/src/test/java/com/segment/analytics/kotlin/destinations/plugins/ExampleUnitTest.kt renamed to lib/src/test/java/com/segment/analytics/kotlin/destinations/amplitude/ExampleUnitTest.kt lib/src/test/java/com/segment/analytics/kotlin/destinations/plugins/ExampleUnitTest.kt renamed to lib/src/test/java/com/segment/analytics/kotlin/destinations/amplitude/ExampleUnitTest.kt

@@ -1,9 +1,8 @@
-package com.segment.analytics.kotlin.destinations.plugins
+package com.segment.analytics.kotlin.destinations.amplitude
 
+import org.junit.Assert
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
@@ -12,6 +11,6 @@ import org.junit.Assert.*
 class ExampleUnitTest {
     @Test
     fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
+        Assert.assertEquals(4, 2 + 2)
     }
 }