Skip to content

Commit a56f3a3

Browse files
authoredMar 8, 2022
resolve package name collision (#3)
* update package name * implement versioned plugin
1 parent 16c8750 commit a56f3a3

File tree

6 files changed

+17
-8
lines changed

6 files changed

+17
-8
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ implementation("com.segment.analytics.kotlin.destinations:firebase:1.4.4")
2323
Open the file where you setup and configure the Analytics-Kotlin library. Add this plugin to the list of imports.
2424

2525
```
26-
import com.segment.analytics.kotlin.destinations.plugins.FirebaseDestination
26+
import com.segment.analytics.kotlin.destinations.firebase.FirebaseDestination
2727
```
2828

2929
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

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ plugins {
66
id("mvn-publish")
77
}
88

9+
val VERSION_NAME: String by project
10+
911
android {
1012
compileSdk = 31
1113
buildToolsVersion = "31.0.0"
@@ -17,6 +19,8 @@ android {
1719

1820
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
1921
consumerProguardFiles("proguard-consumer-rules.pro")
22+
23+
buildConfigField("String", "VERSION_NAME", "\"$VERSION_NAME\"")
2024
}
2125

2226
buildTypes {
@@ -38,7 +42,7 @@ android {
3842
dependencies {
3943
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
4044

41-
implementation("com.segment.analytics.kotlin:android:1.4.3")
45+
implementation("com.segment.analytics.kotlin:android:1.5.0")
4246
implementation("androidx.multidex:multidex:2.0.1")
4347

4448
implementation("androidx.core:core-ktx:1.7.0")
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.segment.analytics.kotlin.destinations.plugins
1+
package com.segment.analytics.kotlin.destinations.firebase
22

33
import androidx.test.ext.junit.runners.AndroidJUnit4
44
import androidx.test.platform.app.InstrumentationRegistry
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
1919
fun useAppContext() {
2020
// Context of the app under test.
2121
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22-
assertEquals("com.segment.analytics.kotlin.destinations.plugins.test", appContext.packageName)
22+
assertEquals("com.segment.analytics.kotlin.destinations.firebase.test", appContext.packageName)
2323
}
2424
}

‎lib/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.segment.analytics.kotlin.destinations.plugins">
3+
package="com.segment.analytics.kotlin.destinations.firebase">
44

55
</manifest>

‎lib/src/main/java/com/segment/analytics/kotlin/destinations/plugins/FirebaseDestination.kt renamed to ‎lib/src/main/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestination.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.segment.analytics.kotlin.destinations.plugins
1+
package com.segment.analytics.kotlin.destinations.firebase
22

33
import android.annotation.SuppressLint
44
import android.app.Activity
@@ -11,6 +11,7 @@ import com.segment.analytics.kotlin.android.plugins.AndroidLifecycle
1111
import com.segment.analytics.kotlin.core.*
1212
import com.segment.analytics.kotlin.core.platform.DestinationPlugin
1313
import com.segment.analytics.kotlin.core.platform.Plugin
14+
import com.segment.analytics.kotlin.core.platform.VersionedPlugin
1415
import com.segment.analytics.kotlin.core.platform.plugins.logger.*
1516
import com.segment.analytics.kotlin.core.utilities.getDouble
1617
import com.segment.analytics.kotlin.core.utilities.getMapList
@@ -78,7 +79,7 @@ SOFTWARE.
7879

7980
class FirebaseDestination(
8081
private val context: Context
81-
) : DestinationPlugin(), AndroidLifecycle {
82+
) : DestinationPlugin(), AndroidLifecycle, VersionedPlugin {
8283

8384
override val key: String = "Firebase"
8485
internal var firebaseAnalytics: FirebaseAnalytics? = null
@@ -299,4 +300,8 @@ class FirebaseDestination(
299300
}
300301
}
301302

303+
override fun version(): String {
304+
return BuildConfig.VERSION_NAME
305+
}
306+
302307
}

‎lib/src/test/java/com/segment/analytics/kotlin/destinations/plugins/FirebaseDestinationTest.kt renamed to ‎lib/src/test/java/com/segment/analytics/kotlin/destinations/firebase/FirebaseDestinationTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.segment.analytics.kotlin.destinations.plugins
1+
package com.segment.analytics.kotlin.destinations.firebase
22

33
import android.app.Activity
44
import android.content.Context

0 commit comments

Comments
 (0)