Merge branch 'development'

Author: sofakingforever

README.md

@@ -25,7 +25,7 @@ repositories {
 
 dependencies {
 
-    def version = '1.0.16'
+    def version = '1.0.17'
 
     // add the basic analytics interface library - incl. LoggerDispatcher
     compile "com.sofakingforever.analytics:analytics:version@aar"

analytics/src/main/java/com/sofakingforever/analytics/AnalyticsDispatcher.kt

@@ -1,7 +1,10 @@
 package com.sofakingforever.analytics
 
 import android.content.Context
-import com.sofakingforever.analytics.events.*
+import com.sofakingforever.analytics.events.ContentViewEvent
+import com.sofakingforever.analytics.events.CustomEvent
+import com.sofakingforever.analytics.events.InviteEvent
+import com.sofakingforever.analytics.events.SetUserProperties
 import com.sofakingforever.analytics.events.base.Event
 import com.sofakingforever.analytics.exceptions.UnsupportedEventException
 
@@ -31,8 +34,6 @@ interface AnalyticsDispatcher {
 
     fun trackInviteEvent(inviteEvent: InviteEvent)
 
-    fun setUserProperty(property: SetUserProperty)
-
     fun setUserProperties(properties: SetUserProperties)
 
     /**
@@ -61,11 +62,6 @@ interface AnalyticsDispatcher {
                 handled = true
             }
 
-            if (event is SetUserProperty) {
-                setUserProperty(event)
-                handled = true
-            }
-
             if (event is SetUserProperties) {
                 setUserProperties(event)
                 handled = true

analytics/src/main/java/com/sofakingforever/analytics/events/SetUserProperty.kt

@@ -1,10 +1,16 @@
 package com.sofakingforever.analytics.events
 
-import com.sofakingforever.analytics.events.base.Event
+import com.sofakingforever.analytics.AnalyticsKit
 
-interface SetUserProperty : Event {
+@Deprecated("Use SetUserProperties instead")
+interface SetUserProperty : SetUserProperties {
 
-    val key : String
-    val value : String
+    val key: String
+    val value: String
 
+    override fun getUserProperties(kit: AnalyticsKit): MutableMap<String, Any> {
+        val userProperties = super.getUserProperties(kit)
+        userProperties[key] = value
+        return userProperties
+    }
 }

gradle.properties

@@ -11,4 +11,4 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-version=1.0.16
+version=1.0.17

kit-answers/src/main/java/com/sofakingforever/analytics/kits/answers/AnswersDispatcherImpl.kt

@@ -37,10 +37,6 @@ class AnswersDispatcherImpl(override val init: Boolean, private vararg val fabri
         instance.logInvite(inviteEvent.createAnswersInviteEvent())
     }
 
-    override fun setUserProperty(property: SetUserProperty) {
-        // Answers doesn't support this
-    }
-
     override fun setUserProperties(properties: SetUserProperties) {
         // Answers doesn't support this
     }

kit-firebase/src/main/java/com/sofakingforever/analytics/kits/firebase/FirebaseDispatcherImpl.kt

@@ -33,11 +33,6 @@ class FirebaseDispatcherImpl(override val init: Boolean) : AnalyticsDispatcher {
     override fun trackInviteEvent(inviteEvent: InviteEvent) {
         firebaseAnalytics?.logEvent(FirebaseAnalytics.Event.SHARE, inviteEvent.getBundle())
     }
-
-    override fun setUserProperty(property: SetUserProperty) {
-        firebaseAnalytics?.setUserProperty(property.key, property.value)
-    }
-
     override fun setUserProperties(properties: SetUserProperties) {
         properties.getUserProperties(kit).forEach {
             firebaseAnalytics?.setUserProperty(it.key, it.value.toString())

kit-flurry/src/main/java/com/sofakingforever/analytics/kits/flurry/FlurryDispatcherImpl.kt

@@ -3,7 +3,10 @@ package com.sofakingforever.analytics.kits.flurry
 import android.content.Context
 import com.flurry.android.FlurryAgent
 import com.sofakingforever.analytics.AnalyticsDispatcher
-import com.sofakingforever.analytics.events.*
+import com.sofakingforever.analytics.events.ContentViewEvent
+import com.sofakingforever.analytics.events.CustomEvent
+import com.sofakingforever.analytics.events.InviteEvent
+import com.sofakingforever.analytics.events.SetUserProperties
 
 class FlurryDispatcherImpl(val apiKey: String) : AnalyticsDispatcher {
 
@@ -34,9 +37,6 @@ class FlurryDispatcherImpl(val apiKey: String) : AnalyticsDispatcher {
         FlurryAgent.logEvent("inviteEvent_" + inviteEvent.packageName)
 
     }
-    override fun setUserProperty(property: SetUserProperty) {
-        // Flurry doesn't support this as far as I know
-    }
 
     override fun setUserProperties(properties: SetUserProperties) {
         // Flurry doesn't support this

kit-mixpanel/src/main/java/com/sofakingforever/analytics/kits/mixpanel/MixPanelDispatcherImpl.kt

@@ -4,7 +4,10 @@ import android.content.Context
 import com.mixpanel.android.mpmetrics.MixpanelAPI
 import com.sofakingforever.analytics.AnalyticsDispatcher
 import com.sofakingforever.analytics.AnalyticsKit
-import com.sofakingforever.analytics.events.*
+import com.sofakingforever.analytics.events.ContentViewEvent
+import com.sofakingforever.analytics.events.CustomEvent
+import com.sofakingforever.analytics.events.InviteEvent
+import com.sofakingforever.analytics.events.SetUserProperties
 
 
 class MixPanelDispatcherImpl(override val init: Boolean = false, private val projectToken: String? = null) : AnalyticsDispatcher {
@@ -13,7 +16,6 @@ class MixPanelDispatcherImpl(override val init: Boolean = false, private val pro
     override val dispatcherName: String = DispatcherName
 
 
-
     override val kit: AnalyticsKit = MixPanelKit.instance
 
     private lateinit var mixpanel: MixpanelAPI
@@ -34,10 +36,6 @@ class MixPanelDispatcherImpl(override val init: Boolean = false, private val pro
         // not implementing for mixpanel
     }
 
-    override fun setUserProperty(property: SetUserProperty) {
-        mixpanel.people.set(property.key, property.value)
-    }
-
     override fun setUserProperties(properties: SetUserProperties) {
         mixpanel.people.setMap(properties.getUserProperties(kit))
     }