diff --git a/README.md b/README.md index 056841d..622edae 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ implementation("com.segment.analytics.kotlin.destinations:firebase: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.FirebaseDestination +import com.segment.analytics.kotlin.destinations.firebase.FirebaseDestination ``` Just under your Analytics-Kotlin library setup, call `analytics.add(plugin = ...)` to add an instance of the plugin to the Analytics timeline. diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 0b5588f..8bca09e 100644 --- a/lib/build.gradle.kts +++ b/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") diff --git a/lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/plugins/ExampleInstrumentedTest.kt b/lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/firebase/ExampleInstrumentedTest.kt similarity index 86% rename from lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/plugins/ExampleInstrumentedTest.kt rename to lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/firebase/ExampleInstrumentedTest.kt index 3686f35..5300af1 100644 --- a/lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/plugins/ExampleInstrumentedTest.kt +++ b/lib/src/androidTest/java/com/segment/analytics/kotlin/destinations/firebase/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.segment.analytics.kotlin.destinations.plugins +package com.segment.analytics.kotlin.destinations.firebase import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry @@ -19,6 +19,6 @@ 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) + assertEquals("com.segment.analytics.kotlin.destinations.firebase.test", appContext.packageName) } } \ No newline at end of file diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml index e5f5b96..2bbc6bd 100644 --- a/lib/src/main/AndroidManifest.xml +++ b/lib/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.segment.analytics.kotlin.destinations.firebase"> \ No newline at end of file diff --git a/lib/src/main/java/com/segment/analytics/kotlin/destinations/plugins/FirebaseDestination.kt b/lib/src/main/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestination.kt similarity index 97% rename from lib/src/main/java/com/segment/analytics/kotlin/destinations/plugins/FirebaseDestination.kt rename to lib/src/main/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestination.kt index 8ef25ba..a726abc 100644 --- a/lib/src/main/java/com/segment/analytics/kotlin/destinations/plugins/FirebaseDestination.kt +++ b/lib/src/main/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestination.kt @@ -1,4 +1,4 @@ -package com.segment.analytics.kotlin.destinations.plugins +package com.segment.analytics.kotlin.destinations.firebase import android.annotation.SuppressLint import android.app.Activity @@ -11,6 +11,7 @@ import com.segment.analytics.kotlin.android.plugins.AndroidLifecycle import 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.VersionedPlugin import com.segment.analytics.kotlin.core.platform.plugins.logger.* import com.segment.analytics.kotlin.core.utilities.getDouble import com.segment.analytics.kotlin.core.utilities.getMapList @@ -78,7 +79,7 @@ SOFTWARE. class FirebaseDestination( private val context: Context -) : DestinationPlugin(), AndroidLifecycle { +) : DestinationPlugin(), AndroidLifecycle, VersionedPlugin { override val key: String = "Firebase" internal var firebaseAnalytics: FirebaseAnalytics? = null @@ -299,4 +300,8 @@ class FirebaseDestination( } } + override fun version(): String { + return BuildConfig.VERSION_NAME + } + } \ No newline at end of file diff --git a/lib/src/test/java/com/segment/analytics/kotlin/destinations/plugins/FirebaseDestinationTest.kt b/lib/src/test/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestinationTest.kt similarity index 99% rename from lib/src/test/java/com/segment/analytics/kotlin/destinations/plugins/FirebaseDestinationTest.kt rename to lib/src/test/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestinationTest.kt index 022ac7f..6fbf301 100644 --- a/lib/src/test/java/com/segment/analytics/kotlin/destinations/plugins/FirebaseDestinationTest.kt +++ b/lib/src/test/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestinationTest.kt @@ -1,4 +1,4 @@ -package com.segment.analytics.kotlin.destinations.plugins +package com.segment.analytics.kotlin.destinations.firebase import android.app.Activity import android.content.Context