From da7a11c9f0cd6619bc1ecf7db6334339d0c54f6c Mon Sep 17 00:00:00 2001 From: Brian Giori Date: Wed, 2 Feb 2022 15:21:05 -0800 Subject: [PATCH] feat: rename amplitude-core to analytics-connector (#13) * fix: rename core to analytcs-connector * rename core classes to connector * connector v1.0.0 --- {core => analytics-connector}/.gitignore | 0 {core => analytics-connector}/build.gradle | 6 +-- .../src/main/AndroidManifest.xml | 2 +- .../analytics/connector/AnalyticsConnector.kt | 22 ++++++++ .../analytics/connector/EventBridge.kt | 6 +-- .../analytics/connector}/IdentityStore.kt | 2 +- .../analytics/connector}/util/JSON.kt | 2 +- .../analytics/connector/EventBridgeTest.kt | 10 ++-- .../analytics/connector}/IdentityStoreTest.kt | 16 +++--- .../java/com/amplitude/core/AmplitudeCore.kt | 22 -------- sdk/build.gradle | 5 +- ...vider.kt => ConnectorAnalyticsProvider.kt} | 14 ++--- ...erProvider.kt => ConnectorUserProvider.kt} | 10 ++-- .../experiment/DefaultExperimentClient.kt | 2 +- .../com/amplitude/experiment/Experiment.kt | 10 ++-- .../experiment/AnalyticsProviderTest.kt | 52 +++++++++---------- settings.gradle | 2 +- 17 files changed, 97 insertions(+), 86 deletions(-) rename {core => analytics-connector}/.gitignore (100%) rename {core => analytics-connector}/build.gradle (77%) rename {core => analytics-connector}/src/main/AndroidManifest.xml (75%) create mode 100644 analytics-connector/src/main/java/com/amplitude/analytics/connector/AnalyticsConnector.kt rename core/src/main/java/com/amplitude/core/AnalyticsConnector.kt => analytics-connector/src/main/java/com/amplitude/analytics/connector/EventBridge.kt (90%) rename {core/src/main/java/com/amplitude/core => analytics-connector/src/main/java/com/amplitude/analytics/connector}/IdentityStore.kt (99%) rename {core/src/main/java/com/amplitude/core => analytics-connector/src/main/java/com/amplitude/analytics/connector}/util/JSON.kt (97%) rename core/src/test/java/com/amplitude/core/AnalyticsConnectorTest.kt => analytics-connector/src/test/java/com/amplitude/analytics/connector/EventBridgeTest.kt (80%) rename {core/src/test/java/com/amplitude/core => analytics-connector/src/test/java/com/amplitude/analytics/connector}/IdentityStoreTest.kt (95%) delete mode 100644 core/src/main/java/com/amplitude/core/AmplitudeCore.kt rename sdk/src/main/java/com/amplitude/experiment/{CoreAnalyticsProvider.kt => ConnectorAnalyticsProvider.kt} (81%) rename sdk/src/main/java/com/amplitude/experiment/{CoreUserProvider.kt => ConnectorUserProvider.kt} (89%) diff --git a/core/.gitignore b/analytics-connector/.gitignore similarity index 100% rename from core/.gitignore rename to analytics-connector/.gitignore diff --git a/core/build.gradle b/analytics-connector/build.gradle similarity index 77% rename from core/build.gradle rename to analytics-connector/build.gradle index bcc6ad4..e8a6dc4 100644 --- a/core/build.gradle +++ b/analytics-connector/build.gradle @@ -4,11 +4,11 @@ plugins { } ext { - PUBLISH_NAME = 'Amplitude SDK Core' - PUBLISH_DESCRIPTION = 'Core package for Amplitide SDKs' + PUBLISH_NAME = 'Amplitude Analytics SDK Connector' + PUBLISH_DESCRIPTION = 'Connector for seamlessly integrating with the Amplitude Analytics SDK' PUBLISH_GROUP_ID = 'com.amplitude' PUBLISH_VERSION = '1.0.0' - PUBLISH_ARTIFACT_ID = 'amplitude-core' + PUBLISH_ARTIFACT_ID = 'analytics-connector' } apply from: "${rootDir}/gradle/publish-module.gradle" diff --git a/core/src/main/AndroidManifest.xml b/analytics-connector/src/main/AndroidManifest.xml similarity index 75% rename from core/src/main/AndroidManifest.xml rename to analytics-connector/src/main/AndroidManifest.xml index 3aea41b..e937d4c 100644 --- a/core/src/main/AndroidManifest.xml +++ b/analytics-connector/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.amplitude.analytics"> diff --git a/analytics-connector/src/main/java/com/amplitude/analytics/connector/AnalyticsConnector.kt b/analytics-connector/src/main/java/com/amplitude/analytics/connector/AnalyticsConnector.kt new file mode 100644 index 0000000..2eb9b79 --- /dev/null +++ b/analytics-connector/src/main/java/com/amplitude/analytics/connector/AnalyticsConnector.kt @@ -0,0 +1,22 @@ +package com.amplitude.analytics.connector + +class AnalyticsConnector private constructor() { + + companion object { + + private val instancesLock = Any() + private val instances = mutableMapOf() + + @JvmStatic + fun getInstance(instanceName: String): AnalyticsConnector { + return synchronized(instancesLock) { + instances.getOrPut(instanceName) { + AnalyticsConnector() + } + } + } + } + + val identityStore: IdentityStore = IdentityStoreImpl() + val eventBridge: EventBridge = EventBridgeImpl() +} diff --git a/core/src/main/java/com/amplitude/core/AnalyticsConnector.kt b/analytics-connector/src/main/java/com/amplitude/analytics/connector/EventBridge.kt similarity index 90% rename from core/src/main/java/com/amplitude/core/AnalyticsConnector.kt rename to analytics-connector/src/main/java/com/amplitude/analytics/connector/EventBridge.kt index b0d248a..be0553b 100644 --- a/core/src/main/java/com/amplitude/core/AnalyticsConnector.kt +++ b/analytics-connector/src/main/java/com/amplitude/analytics/connector/EventBridge.kt @@ -1,4 +1,4 @@ -package com.amplitude.core +package com.amplitude.analytics.connector import java.util.concurrent.ArrayBlockingQueue @@ -10,13 +10,13 @@ data class AnalyticsEvent( val userProperties: Map>? = null, ) -interface AnalyticsConnector { +interface EventBridge { fun logEvent(event: AnalyticsEvent) fun setEventReceiver(receiver: AnalyticsEventReceiver?) } -internal class AnalyticsConnectorImpl : AnalyticsConnector { +internal class EventBridgeImpl : EventBridge { private val lock = Any() private var receiver: AnalyticsEventReceiver? = null diff --git a/core/src/main/java/com/amplitude/core/IdentityStore.kt b/analytics-connector/src/main/java/com/amplitude/analytics/connector/IdentityStore.kt similarity index 99% rename from core/src/main/java/com/amplitude/core/IdentityStore.kt rename to analytics-connector/src/main/java/com/amplitude/analytics/connector/IdentityStore.kt index f733547..5aabfe9 100644 --- a/core/src/main/java/com/amplitude/core/IdentityStore.kt +++ b/analytics-connector/src/main/java/com/amplitude/analytics/connector/IdentityStore.kt @@ -1,4 +1,4 @@ -package com.amplitude.core +package com.amplitude.analytics.connector import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.read diff --git a/core/src/main/java/com/amplitude/core/util/JSON.kt b/analytics-connector/src/main/java/com/amplitude/analytics/connector/util/JSON.kt similarity index 97% rename from core/src/main/java/com/amplitude/core/util/JSON.kt rename to analytics-connector/src/main/java/com/amplitude/analytics/connector/util/JSON.kt index aa5397b..126daa3 100644 --- a/core/src/main/java/com/amplitude/core/util/JSON.kt +++ b/analytics-connector/src/main/java/com/amplitude/analytics/connector/util/JSON.kt @@ -1,6 +1,6 @@ @file:JvmName("JSONUtil") -package com.amplitude.core.util +package com.amplitude.analytics.connector.util import org.json.JSONArray import org.json.JSONObject diff --git a/core/src/test/java/com/amplitude/core/AnalyticsConnectorTest.kt b/analytics-connector/src/test/java/com/amplitude/analytics/connector/EventBridgeTest.kt similarity index 80% rename from core/src/test/java/com/amplitude/core/AnalyticsConnectorTest.kt rename to analytics-connector/src/test/java/com/amplitude/analytics/connector/EventBridgeTest.kt index 9dcccb4..c105d65 100644 --- a/core/src/test/java/com/amplitude/core/AnalyticsConnectorTest.kt +++ b/analytics-connector/src/test/java/com/amplitude/analytics/connector/EventBridgeTest.kt @@ -1,14 +1,16 @@ -package com.amplitude.core +package com.amplitude.analytics.connector +import com.amplitude.analytics.connector.AnalyticsEvent +import com.amplitude.analytics.connector.EventBridgeImpl import org.junit.Assert import org.junit.Test -class AnalyticsConnectorTest { +class EventBridgeTest { @Test fun `test addEventListener, logEvent, listener called`() { val testEvent = AnalyticsEvent("test") - val analyticsConnector = AnalyticsConnectorImpl() + val analyticsConnector = EventBridgeImpl() analyticsConnector.setEventReceiver { Assert.assertEquals(testEvent, it) } @@ -20,7 +22,7 @@ class AnalyticsConnectorTest { val testEvent0 = AnalyticsEvent("test0") val testEvent1 = AnalyticsEvent("test1") val testEvent2 = AnalyticsEvent("test2") - val analyticsConnector = AnalyticsConnectorImpl() + val analyticsConnector = EventBridgeImpl() analyticsConnector.logEvent(testEvent0) analyticsConnector.logEvent(testEvent1) var eventCount = 0 diff --git a/core/src/test/java/com/amplitude/core/IdentityStoreTest.kt b/analytics-connector/src/test/java/com/amplitude/analytics/connector/IdentityStoreTest.kt similarity index 95% rename from core/src/test/java/com/amplitude/core/IdentityStoreTest.kt rename to analytics-connector/src/test/java/com/amplitude/analytics/connector/IdentityStoreTest.kt index 71851d3..84e2f88 100644 --- a/core/src/test/java/com/amplitude/core/IdentityStoreTest.kt +++ b/analytics-connector/src/test/java/com/amplitude/analytics/connector/IdentityStoreTest.kt @@ -1,7 +1,7 @@ -package com.amplitude.core +package com.amplitude.analytics.connector import com.amplitude.api.Identify -import com.amplitude.core.util.toUpdateUserPropertiesMap +import com.amplitude.analytics.connector.util.toUpdateUserPropertiesMap import org.json.JSONArray import org.json.JSONObject import org.junit.Assert @@ -85,11 +85,13 @@ class IdentityStoreTest { @Test fun `test updateUserProperties, unset`() { val identityStore = IdentityStoreImpl() - identityStore.setIdentity(Identity(userProperties = mapOf( + identityStore.setIdentity( + Identity(userProperties = mapOf( "key" to "value", "other" to true, "final" to 4.2 - ))) + )) + ) identityStore.editIdentity() .updateUserProperties( mapOf("\$unset" to mapOf("other" to "-", "final" to "-")) @@ -104,12 +106,14 @@ class IdentityStoreTest { @Test fun `test updateUserProperties, clearAll`() { val identityStore = IdentityStoreImpl() - identityStore.setIdentity(Identity(userProperties = mapOf( + identityStore.setIdentity( + Identity(userProperties = mapOf( "key" to listOf(-3, -2, -1, 0), "key2" to mapOf("wow" to "cool"), "key3" to 3, "key4" to false, - ))) + )) + ) identityStore.editIdentity() .updateUserProperties( mapOf("\$clearAll" to mapOf()) diff --git a/core/src/main/java/com/amplitude/core/AmplitudeCore.kt b/core/src/main/java/com/amplitude/core/AmplitudeCore.kt deleted file mode 100644 index d83b012..0000000 --- a/core/src/main/java/com/amplitude/core/AmplitudeCore.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.amplitude.core - -class AmplitudeCore private constructor() { - - companion object { - - private val instancesLock = Any() - private val instances = mutableMapOf() - - @JvmStatic - fun getInstance(instanceName: String): AmplitudeCore { - return synchronized(instancesLock) { - instances.getOrPut(instanceName) { - AmplitudeCore() - } - } - } - } - - val identityStore: IdentityStore = IdentityStoreImpl() - val analyticsConnector: AnalyticsConnector = AnalyticsConnectorImpl() -} diff --git a/sdk/build.gradle b/sdk/build.gradle index 5900715..68d7d12 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -34,10 +34,11 @@ android { } dependencies { - implementation 'com.amplitude:amplitude-core:1.0.0' - implementation 'com.amplitude:android-sdk:2.26.1' + implementation 'com.amplitude:analytics-connector:1.0.0' implementation 'com.squareup.okhttp3:okhttp:4.9.1' + implementation 'com.amplitude:android-sdk:2.26.1' + testImplementation 'junit:junit:4.13.2' testImplementation 'org.json:json:20201115' } diff --git a/sdk/src/main/java/com/amplitude/experiment/CoreAnalyticsProvider.kt b/sdk/src/main/java/com/amplitude/experiment/ConnectorAnalyticsProvider.kt similarity index 81% rename from sdk/src/main/java/com/amplitude/experiment/CoreAnalyticsProvider.kt rename to sdk/src/main/java/com/amplitude/experiment/ConnectorAnalyticsProvider.kt index f77cf02..0064011 100644 --- a/sdk/src/main/java/com/amplitude/experiment/CoreAnalyticsProvider.kt +++ b/sdk/src/main/java/com/amplitude/experiment/ConnectorAnalyticsProvider.kt @@ -1,19 +1,19 @@ package com.amplitude.experiment -import com.amplitude.core.AnalyticsConnector -import com.amplitude.core.AnalyticsEvent +import com.amplitude.analytics.connector.EventBridge +import com.amplitude.analytics.connector.AnalyticsEvent import com.amplitude.experiment.analytics.ExperimentAnalyticsEvent import com.amplitude.experiment.analytics.ExperimentAnalyticsProvider -internal class CoreAnalyticsProvider( - private val analyticsConnector: AnalyticsConnector +internal class ConnectorAnalyticsProvider( + private val eventBridge: EventBridge ): ExperimentAnalyticsProvider { override fun track(event: ExperimentAnalyticsEvent) { val eventProperties: Map = event.properties .filterValues { it != null } .mapValues { it.value!! } - analyticsConnector.logEvent( + eventBridge.logEvent( AnalyticsEvent( eventType = event.name, eventProperties = eventProperties @@ -23,7 +23,7 @@ internal class CoreAnalyticsProvider( override fun setUserProperty(event: ExperimentAnalyticsEvent) { val variant = event.variant.value ?: return - analyticsConnector.logEvent( + eventBridge.logEvent( AnalyticsEvent( "\$identify", null, @@ -37,7 +37,7 @@ internal class CoreAnalyticsProvider( } override fun unsetUserProperty(event: ExperimentAnalyticsEvent) { - analyticsConnector.logEvent( + eventBridge.logEvent( AnalyticsEvent( "\$identify", null, diff --git a/sdk/src/main/java/com/amplitude/experiment/CoreUserProvider.kt b/sdk/src/main/java/com/amplitude/experiment/ConnectorUserProvider.kt similarity index 89% rename from sdk/src/main/java/com/amplitude/experiment/CoreUserProvider.kt rename to sdk/src/main/java/com/amplitude/experiment/ConnectorUserProvider.kt index 7861eeb..65b1ac0 100644 --- a/sdk/src/main/java/com/amplitude/experiment/CoreUserProvider.kt +++ b/sdk/src/main/java/com/amplitude/experiment/ConnectorUserProvider.kt @@ -1,14 +1,14 @@ package com.amplitude.experiment import android.content.Context -import com.amplitude.core.Identity -import com.amplitude.core.IdentityStore +import com.amplitude.analytics.connector.Identity +import com.amplitude.analytics.connector.IdentityStore import com.amplitude.experiment.util.Lock import com.amplitude.experiment.util.LockResult import java.util.concurrent.TimeoutException import kotlin.jvm.Throws -internal class CoreUserProvider( +internal class ConnectorUserProvider( context: Context, private val identityStore: IdentityStore, ): ExperimentUserProvider { @@ -66,3 +66,7 @@ private fun IdentityStore.getIdentityOrWait(ms: Long): Identity { removeIdentityListener(callback) return result } + +private fun Identity.isUnidentified(): Boolean { + return deviceId.isNullOrBlank() && userId.isNullOrBlank() +} diff --git a/sdk/src/main/java/com/amplitude/experiment/DefaultExperimentClient.kt b/sdk/src/main/java/com/amplitude/experiment/DefaultExperimentClient.kt index f07fee8..60e4b23 100644 --- a/sdk/src/main/java/com/amplitude/experiment/DefaultExperimentClient.kt +++ b/sdk/src/main/java/com/amplitude/experiment/DefaultExperimentClient.kt @@ -281,7 +281,7 @@ internal class DefaultExperimentClient internal constructor( @Throws(IllegalStateException::class) private fun getUserMergedWithProviderOrWait(ms: Long): ExperimentUser { val safeUserProvider = userProvider - val providedUser = if (safeUserProvider is CoreUserProvider) { + val providedUser = if (safeUserProvider is ConnectorUserProvider) { try { safeUserProvider.getUserOrWait(ms) } catch (e: TimeoutException) { diff --git a/sdk/src/main/java/com/amplitude/experiment/Experiment.kt b/sdk/src/main/java/com/amplitude/experiment/Experiment.kt index e1570d1..5a4299c 100644 --- a/sdk/src/main/java/com/amplitude/experiment/Experiment.kt +++ b/sdk/src/main/java/com/amplitude/experiment/Experiment.kt @@ -1,7 +1,7 @@ package com.amplitude.experiment import android.app.Application -import com.amplitude.core.AmplitudeCore +import com.amplitude.analytics.connector.AnalyticsConnector import com.amplitude.experiment.storage.SharedPrefsStorage import com.amplitude.experiment.util.AndroidLogger import com.amplitude.experiment.util.Logger @@ -82,16 +82,16 @@ object Experiment { ): ExperimentClient = synchronized(instances) { val instanceName = config.instanceName val instanceKey = "$instanceName.$apiKey" - val core = AmplitudeCore.getInstance(instanceName) + val connector = AnalyticsConnector.getInstance(instanceName) val instance = when (val instance = instances[instanceKey]) { null -> { Logger.implementation = AndroidLogger(config.debug) val configBuilder = config.copyToBuilder() if (config.userProvider == null) { - configBuilder.userProvider(CoreUserProvider(application, core.identityStore)) + configBuilder.userProvider(ConnectorUserProvider(application, connector.identityStore)) } if (config.analyticsProvider == null) { - configBuilder.analyticsProvider(CoreAnalyticsProvider(core.analyticsConnector)) + configBuilder.analyticsProvider(ConnectorAnalyticsProvider(connector.eventBridge)) } val newInstance = DefaultExperimentClient( apiKey, @@ -102,7 +102,7 @@ object Experiment { ) instances[instanceKey] = newInstance if (config.automaticFetchOnAmplitudeIdentityChange) { - core.identityStore.addIdentityListener { + connector.identityStore.addIdentityListener { newInstance.fetch() } } diff --git a/sdk/src/test/java/com/amplitude/experiment/AnalyticsProviderTest.kt b/sdk/src/test/java/com/amplitude/experiment/AnalyticsProviderTest.kt index 86e4591..068669a 100644 --- a/sdk/src/test/java/com/amplitude/experiment/AnalyticsProviderTest.kt +++ b/sdk/src/test/java/com/amplitude/experiment/AnalyticsProviderTest.kt @@ -1,14 +1,14 @@ package com.amplitude.experiment -import com.amplitude.core.AnalyticsConnector -import com.amplitude.core.AnalyticsEvent -import com.amplitude.core.AnalyticsEventReceiver +import com.amplitude.analytics.connector.AnalyticsEvent +import com.amplitude.analytics.connector.AnalyticsEventReceiver +import com.amplitude.analytics.connector.EventBridge import com.amplitude.experiment.analytics.ExposureEvent import com.amplitude.experiment.util.SessionAnalyticsProvider import org.junit.Assert import org.junit.Test -class TestAnalyticsConnector : AnalyticsConnector { +class TestEventBridge : EventBridge { var logEventCount = 0 var recentEvent: AnalyticsEvent? = null override fun logEvent(event: AnalyticsEvent) { @@ -72,61 +72,61 @@ class AnalyticsProviderTest { @Test fun `set and track called once each per variant`() { - val analyticsConnector = TestAnalyticsConnector() - val coreAnalyticsProvider = SessionAnalyticsProvider(CoreAnalyticsProvider(analyticsConnector)) + val eventBridge = TestEventBridge() + val coreAnalyticsProvider = SessionAnalyticsProvider(ConnectorAnalyticsProvider(eventBridge)) coreAnalyticsProvider.setUserProperty(exposureEvent1) - Assert.assertEquals(expectedSet1, analyticsConnector.recentEvent) + Assert.assertEquals(expectedSet1, eventBridge.recentEvent) coreAnalyticsProvider.track(exposureEvent1) - Assert.assertEquals(expectedTrack1, analyticsConnector.recentEvent) + Assert.assertEquals(expectedTrack1, eventBridge.recentEvent) repeat(10) { coreAnalyticsProvider.setUserProperty(exposureEvent1) - Assert.assertEquals(expectedTrack1, analyticsConnector.recentEvent) + Assert.assertEquals(expectedTrack1, eventBridge.recentEvent) coreAnalyticsProvider.track(exposureEvent1) - Assert.assertEquals(expectedTrack1, analyticsConnector.recentEvent) + Assert.assertEquals(expectedTrack1, eventBridge.recentEvent) } - Assert.assertEquals(analyticsConnector.logEventCount, 2) + Assert.assertEquals(eventBridge.logEventCount, 2) coreAnalyticsProvider.setUserProperty(exposureEvent2) - Assert.assertEquals(expectedSet2, analyticsConnector.recentEvent) + Assert.assertEquals(expectedSet2, eventBridge.recentEvent) coreAnalyticsProvider.track(exposureEvent2) - Assert.assertEquals(expectedTrack2, analyticsConnector.recentEvent) + Assert.assertEquals(expectedTrack2, eventBridge.recentEvent) repeat(10) { coreAnalyticsProvider.setUserProperty(exposureEvent2) - Assert.assertEquals(expectedTrack2, analyticsConnector.recentEvent) + Assert.assertEquals(expectedTrack2, eventBridge.recentEvent) coreAnalyticsProvider.track(exposureEvent2) - Assert.assertEquals(expectedTrack2, analyticsConnector.recentEvent) + Assert.assertEquals(expectedTrack2, eventBridge.recentEvent) } - Assert.assertEquals(analyticsConnector.logEventCount, 4) + Assert.assertEquals(eventBridge.logEventCount, 4) } @Test fun `unset called once per key`() { - val analyticsConnector = TestAnalyticsConnector() - val coreAnalyticsProvider = SessionAnalyticsProvider(CoreAnalyticsProvider(analyticsConnector)) + val eventBridge = TestEventBridge() + val coreAnalyticsProvider = SessionAnalyticsProvider(ConnectorAnalyticsProvider(eventBridge)) val exposureEvent1 = ExposureEvent(ExperimentUser(), "test-key", Variant("test"), VariantSource.LOCAL_STORAGE) repeat(10) { coreAnalyticsProvider.unsetUserProperty(exposureEvent1) - Assert.assertEquals(expectedUnset, analyticsConnector.recentEvent) + Assert.assertEquals(expectedUnset, eventBridge.recentEvent) } - Assert.assertEquals(1, analyticsConnector.logEventCount) + Assert.assertEquals(1, eventBridge.logEventCount) } @Test fun `test property set tracked, unset, set tracked`() { - val analyticsConnector = TestAnalyticsConnector() - val coreAnalyticsProvider = CoreAnalyticsProvider(analyticsConnector) + val eventBridge = TestEventBridge() + val coreAnalyticsProvider = ConnectorAnalyticsProvider(eventBridge) repeat(10) { // set coreAnalyticsProvider.setUserProperty(exposureEvent1) - Assert.assertEquals(expectedSet1, analyticsConnector.recentEvent) + Assert.assertEquals(expectedSet1, eventBridge.recentEvent) // track coreAnalyticsProvider.track(exposureEvent1) - Assert.assertEquals(expectedTrack1, analyticsConnector.recentEvent) + Assert.assertEquals(expectedTrack1, eventBridge.recentEvent) // unset coreAnalyticsProvider.unsetUserProperty(exposureEvent1) - Assert.assertEquals(expectedUnset, analyticsConnector.recentEvent) + Assert.assertEquals(expectedUnset, eventBridge.recentEvent) } - Assert.assertEquals(analyticsConnector.logEventCount, 30) + Assert.assertEquals(eventBridge.logEventCount, 30) } } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 5f10379..ce7fb05 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ include ':example' include ':sdk' -include ':core' +include ':analytics-connector' rootProject.name = "experiment"