chore: add pinpoint-core package (#165)

* fix service class notification handling * add pinpoint core package
aws-amplify · Mar 14, 2023 · 58ca09d · 58ca09d
1 parent 398b148
commit 58ca09d
Show file tree

Hide file tree

Showing 51 changed files with 154 additions and 159 deletions.
diff --git a/aws-analytics-pinpoint-targeting/gradle.properties b/aws-analytics-pinpoint-targeting/gradle.properties
diff --git a/aws-analytics-pinpoint/build.gradle.kts b/aws-analytics-pinpoint/build.gradle.kts
@@ -26,7 +26,7 @@ group = properties["POM_GROUP"].toString()
 
 dependencies {
     implementation(project(":core"))
-    implementation(project(":aws-analytics-pinpoint-targeting"))
+    implementation(project(":aws-pinpoint-core"))
 
     implementation(dependency.androidx.appcompat)
     implementation(dependency.aws.pinpoint)

diff --git a/...Test/java/com/amplifyframework/analytics/pinpoint/PinpointAnalyticsInstrumentationTest.kt b/...Test/java/com/amplifyframework/analytics/pinpoint/PinpointAnalyticsInstrumentationTest.kt
@@ -28,14 +28,14 @@ import com.amplifyframework.analytics.AnalyticsEvent
 import com.amplifyframework.analytics.AnalyticsProperties
 import com.amplifyframework.analytics.UserProfile
 import com.amplifyframework.analytics.pinpoint.models.AWSPinpointUserProfile
-import com.amplifyframework.analytics.pinpoint.targeting.endpointProfile.EndpointProfile
 import com.amplifyframework.auth.AuthPlugin
 import com.amplifyframework.auth.cognito.AWSCognitoAuthPlugin
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.hub.HubChannel
 import com.amplifyframework.hub.HubEvent
 import com.amplifyframework.logging.AndroidLoggingPlugin
 import com.amplifyframework.logging.LogLevel
+import com.amplifyframework.pinpoint.core.endpointProfile.EndpointProfile
 import com.amplifyframework.testutils.HubAccumulator
 import com.amplifyframework.testutils.Resources
 import com.amplifyframework.testutils.Sleep

diff --git a/...c/main/java/com/amplifyframework/analytics/pinpoint/AWSPinpointAnalyticsPluginBehavior.kt b/...c/main/java/com/amplifyframework/analytics/pinpoint/AWSPinpointAnalyticsPluginBehavior.kt
@@ -12,6 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
+
 package com.amplifyframework.analytics.pinpoint
 
 import com.amplifyframework.analytics.AnalyticsBooleanProperty
@@ -22,8 +23,8 @@ import com.amplifyframework.analytics.AnalyticsIntegerProperty
 import com.amplifyframework.analytics.AnalyticsProperties
 import com.amplifyframework.analytics.AnalyticsStringProperty
 import com.amplifyframework.analytics.UserProfile
-import com.amplifyframework.analytics.pinpoint.targeting.AnalyticsClient
-import com.amplifyframework.analytics.pinpoint.targeting.TargetingClient
+import com.amplifyframework.pinpoint.core.AnalyticsClient
+import com.amplifyframework.pinpoint.core.TargetingClient
 
 internal class AWSPinpointAnalyticsPluginBehavior(
     private val analyticsClient: AnalyticsClient,

diff --git a/...alytics-pinpoint/src/main/java/com/amplifyframework/analytics/pinpoint/PinpointManager.kt b/...alytics-pinpoint/src/main/java/com/amplifyframework/analytics/pinpoint/PinpointManager.kt
@@ -17,12 +17,12 @@ package com.amplifyframework.analytics.pinpoint
 import android.content.Context
 import aws.sdk.kotlin.services.pinpoint.PinpointClient
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
-import com.amplifyframework.analytics.pinpoint.targeting.AnalyticsClient
-import com.amplifyframework.analytics.pinpoint.targeting.TargetingClient
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidAppDetails
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidDeviceDetails
-import com.amplifyframework.analytics.pinpoint.targeting.database.PinpointDatabase
-import com.amplifyframework.analytics.pinpoint.targeting.util.getUniqueId
+import com.amplifyframework.pinpoint.core.AnalyticsClient
+import com.amplifyframework.pinpoint.core.TargetingClient
+import com.amplifyframework.pinpoint.core.data.AndroidAppDetails
+import com.amplifyframework.pinpoint.core.data.AndroidDeviceDetails
+import com.amplifyframework.pinpoint.core.database.PinpointDatabase
+import com.amplifyframework.pinpoint.core.util.getUniqueId
 
 /**
  * PinpointManager is the entry point to Pinpoint Analytics and Targeting.

diff --git a/.../src/main/java/com/amplifyframework/analytics/pinpoint/models/AWSPinpointUserProfile.java b/.../src/main/java/com/amplifyframework/analytics/pinpoint/models/AWSPinpointUserProfile.java
@@ -21,7 +21,7 @@
 
 import com.amplifyframework.analytics.AnalyticsProperties;
 import com.amplifyframework.analytics.UserProfile;
-import com.amplifyframework.analytics.pinpoint.targeting.models.AWSPinpointUserProfileBehavior;
+import com.amplifyframework.pinpoint.core.models.AWSPinpointUserProfileBehavior;
 
 import java.util.Objects;
 

diff --git a/...st/java/com/amplifyframework/analytics/pinpoint/AWSPinpointAnalyticsPluginBehaviorTest.kt b/...st/java/com/amplifyframework/analytics/pinpoint/AWSPinpointAnalyticsPluginBehaviorTest.kt
@@ -19,15 +19,15 @@ import androidx.test.core.app.ApplicationProvider
 import com.amplifyframework.analytics.AnalyticsEvent
 import com.amplifyframework.analytics.AnalyticsProperties
 import com.amplifyframework.analytics.pinpoint.models.AWSPinpointUserProfile
-import com.amplifyframework.analytics.pinpoint.targeting.AnalyticsClient
-import com.amplifyframework.analytics.pinpoint.targeting.TargetingClient
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidAppDetails
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidDeviceDetails
-import com.amplifyframework.analytics.pinpoint.targeting.endpointProfile.EndpointProfile
-import com.amplifyframework.analytics.pinpoint.targeting.models.PinpointEvent
-import com.amplifyframework.analytics.pinpoint.targeting.models.PinpointSession
-import com.amplifyframework.analytics.pinpoint.targeting.models.SDKInfo
-import com.amplifyframework.analytics.pinpoint.targeting.util.getUniqueId
+import com.amplifyframework.pinpoint.core.AnalyticsClient
+import com.amplifyframework.pinpoint.core.TargetingClient
+import com.amplifyframework.pinpoint.core.data.AndroidAppDetails
+import com.amplifyframework.pinpoint.core.data.AndroidDeviceDetails
+import com.amplifyframework.pinpoint.core.endpointProfile.EndpointProfile
+import com.amplifyframework.pinpoint.core.models.PinpointEvent
+import com.amplifyframework.pinpoint.core.models.PinpointSession
+import com.amplifyframework.pinpoint.core.models.SDKInfo
+import com.amplifyframework.pinpoint.core.util.getUniqueId
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
@@ -52,7 +52,7 @@ class AWSPinpointAnalyticsPluginBehaviorTest {
 
     @Before
     fun setup() {
-        mockkStatic("com.amplifyframework.analytics.pinpoint.targeting.util.SharedPreferencesUtilKt")
+        mockkStatic("com.amplifyframework.pinpoint.core.util.SharedPreferencesUtilKt")
         every { sharedPrefs.getUniqueId() }.answers { "UNIQUE_ID" }
 
         awsPinpointAnalyticsPluginBehavior = AWSPinpointAnalyticsPluginBehavior(

diff --git a/aws-analytics-pinpoint-targeting/.gitignore → aws-pinpoint-core/.gitignore b/aws-analytics-pinpoint-targeting/.gitignore → aws-pinpoint-core/.gitignore
diff --git a/...ytics-pinpoint-targeting/build.gradle.kts → aws-pinpoint-core/build.gradle.kts b/...ytics-pinpoint-targeting/build.gradle.kts → aws-pinpoint-core/build.gradle.kts
diff --git a/aws-pinpoint-core/gradle.properties b/aws-pinpoint-core/gradle.properties
@@ -0,0 +1,4 @@
+POM_ARTIFACT_ID=aws-pinpoint-core
+POM_NAME=Amplify Framework for Android - Pinpoint Core
+POM_DESCRIPTION=Amplify Framework for Android - Shared Core Implementation for Amazon Pinpoint
+POM_PACKAGING=aar
diff --git a/...nt-targeting/src/main/AndroidManifest.xml → ...inpoint-core/src/main/AndroidManifest.xml b/...nt-targeting/src/main/AndroidManifest.xml → ...inpoint-core/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
    permissions and limitations under the License.
 -->
 
-<manifest package="com.amplifyframework.analytics.pinpoint.targeting" />
+<manifest package="com.amplifyframework.pinpoint.core" />
diff --git a/...ics/pinpoint/targeting/AnalyticsClient.kt → ...ramework/pinpoint/core/AnalyticsClient.kt b/...ics/pinpoint/targeting/AnalyticsClient.kt → ...ramework/pinpoint/core/AnalyticsClient.kt
@@ -13,23 +13,23 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting
+package com.amplifyframework.pinpoint.core
 
 import android.app.Application
 import android.content.Context
 import androidx.annotation.RestrictTo
 import aws.sdk.kotlin.services.pinpoint.PinpointClient
 import com.amplifyframework.analytics.AnalyticsChannelEventName
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidAppDetails
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidDeviceDetails
-import com.amplifyframework.analytics.pinpoint.targeting.database.PinpointDatabase
-import com.amplifyframework.analytics.pinpoint.targeting.models.PinpointEvent
-import com.amplifyframework.analytics.pinpoint.targeting.models.PinpointSession
-import com.amplifyframework.analytics.pinpoint.targeting.models.SDKInfo
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.core.BuildConfig
 import com.amplifyframework.hub.HubChannel
 import com.amplifyframework.hub.HubEvent
+import com.amplifyframework.pinpoint.core.data.AndroidAppDetails
+import com.amplifyframework.pinpoint.core.data.AndroidDeviceDetails
+import com.amplifyframework.pinpoint.core.database.PinpointDatabase
+import com.amplifyframework.pinpoint.core.models.PinpointEvent
+import com.amplifyframework.pinpoint.core.models.PinpointSession
+import com.amplifyframework.pinpoint.core.models.SDKInfo
 import com.amplifyframework.util.UserAgent
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap

diff --git a/...inpoint/targeting/AutoEventSubmitter.java → ...ork/pinpoint/core/AutoEventSubmitter.java b/...inpoint/targeting/AutoEventSubmitter.java → ...ork/pinpoint/core/AutoEventSubmitter.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting;
+package com.amplifyframework.pinpoint.core;
 
 import android.os.Handler;
 import android.os.HandlerThread;

diff --git a/...inpoint/targeting/AutoSessionTracker.java → ...ork/pinpoint/core/AutoSessionTracker.java b/...inpoint/targeting/AutoSessionTracker.java → ...ork/pinpoint/core/AutoSessionTracker.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting;
+package com.amplifyframework.pinpoint.core;
 
 import android.app.Activity;
 import android.app.Application;

diff --git a/...ytics/pinpoint/targeting/EventRecorder.kt → ...yframework/pinpoint/core/EventRecorder.kt b/...ytics/pinpoint/targeting/EventRecorder.kt → ...yframework/pinpoint/core/EventRecorder.kt
@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amplifyframework.analytics.pinpoint.targeting
+package com.amplifyframework.pinpoint.core
 
 import android.content.Context
 import android.database.Cursor
@@ -31,13 +31,13 @@ import aws.sdk.kotlin.services.pinpoint.model.PublicEndpoint
 import aws.sdk.kotlin.services.pinpoint.model.PutEventsRequest
 import aws.sdk.kotlin.services.pinpoint.model.Session
 import com.amplifyframework.analytics.AnalyticsEvent
-import com.amplifyframework.analytics.pinpoint.targeting.database.EventTable
-import com.amplifyframework.analytics.pinpoint.targeting.database.PinpointDatabase
-import com.amplifyframework.analytics.pinpoint.targeting.endpointProfile.EndpointProfile
-import com.amplifyframework.analytics.pinpoint.targeting.models.PinpointEvent
-import com.amplifyframework.analytics.pinpoint.targeting.util.millisToIsoDate
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.logging.Logger
+import com.amplifyframework.pinpoint.core.database.EventTable
+import com.amplifyframework.pinpoint.core.database.PinpointDatabase
+import com.amplifyframework.pinpoint.core.endpointProfile.EndpointProfile
+import com.amplifyframework.pinpoint.core.models.PinpointEvent
+import com.amplifyframework.pinpoint.core.util.millisToIsoDate
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

diff --git a/...k/analytics/pinpoint/targeting/Session.kt → ...amplifyframework/pinpoint/core/Session.kt b/...k/analytics/pinpoint/targeting/Session.kt → ...amplifyframework/pinpoint/core/Session.kt
@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amplifyframework.analytics.pinpoint.targeting
+package com.amplifyframework.pinpoint.core
 
 import android.content.Context
 import androidx.annotation.RestrictTo

diff --git a/...ytics/pinpoint/targeting/SessionClient.kt → ...yframework/pinpoint/core/SessionClient.kt b/...ytics/pinpoint/targeting/SessionClient.kt → ...yframework/pinpoint/core/SessionClient.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting
+package com.amplifyframework.pinpoint.core
 
 import android.content.Context
 import androidx.annotation.RestrictTo

diff --git a/...ics/pinpoint/targeting/TargetingClient.kt → ...ramework/pinpoint/core/TargetingClient.kt b/...ics/pinpoint/targeting/TargetingClient.kt → ...ramework/pinpoint/core/TargetingClient.kt
@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amplifyframework.analytics.pinpoint.targeting
+package com.amplifyframework.pinpoint.core
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -29,16 +29,16 @@ import com.amplifyframework.analytics.AnalyticsIntegerProperty
 import com.amplifyframework.analytics.AnalyticsPropertyBehavior
 import com.amplifyframework.analytics.AnalyticsStringProperty
 import com.amplifyframework.analytics.UserProfile
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidAppDetails
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidDeviceDetails
-import com.amplifyframework.analytics.pinpoint.targeting.endpointProfile.EndpointProfile
-import com.amplifyframework.analytics.pinpoint.targeting.endpointProfile.EndpointProfileLocation
-import com.amplifyframework.analytics.pinpoint.targeting.endpointProfile.EndpointProfileUser
-import com.amplifyframework.analytics.pinpoint.targeting.models.AWSPinpointUserProfileBehavior
-import com.amplifyframework.analytics.pinpoint.targeting.util.getUniqueId
-import com.amplifyframework.analytics.pinpoint.targeting.util.millisToIsoDate
-import com.amplifyframework.analytics.pinpoint.targeting.util.putString
 import com.amplifyframework.core.Amplify
+import com.amplifyframework.pinpoint.core.data.AndroidAppDetails
+import com.amplifyframework.pinpoint.core.data.AndroidDeviceDetails
+import com.amplifyframework.pinpoint.core.endpointProfile.EndpointProfile
+import com.amplifyframework.pinpoint.core.endpointProfile.EndpointProfileLocation
+import com.amplifyframework.pinpoint.core.endpointProfile.EndpointProfileUser
+import com.amplifyframework.pinpoint.core.models.AWSPinpointUserProfileBehavior
+import com.amplifyframework.pinpoint.core.util.getUniqueId
+import com.amplifyframework.pinpoint.core.util.millisToIsoDate
+import com.amplifyframework.pinpoint.core.util.putString
 import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope

diff --git a/...point/targeting/data/AndroidAppDetails.kt → ...k/pinpoint/core/data/AndroidAppDetails.kt b/...point/targeting/data/AndroidAppDetails.kt → ...k/pinpoint/core/data/AndroidAppDetails.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting.data
+package com.amplifyframework.pinpoint.core.data
 
 import android.content.Context
 import androidx.annotation.RestrictTo

diff --git a/...nt/targeting/data/AndroidDeviceDetails.kt → ...inpoint/core/data/AndroidDeviceDetails.kt b/...nt/targeting/data/AndroidDeviceDetails.kt → ...inpoint/core/data/AndroidDeviceDetails.kt
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting.data
+package com.amplifyframework.pinpoint.core.data
 
 import android.content.Context
 import android.os.Build
 import android.telephony.TelephonyManager
 import androidx.annotation.RestrictTo
-import com.amplifyframework.analytics.pinpoint.targeting.util.LocaleSerializer
+import com.amplifyframework.pinpoint.core.util.LocaleSerializer
 import java.util.Locale
 import kotlinx.serialization.Serializable
 

diff --git a/...pinpoint/targeting/database/EventTable.kt → ...work/pinpoint/core/database/EventTable.kt b/...pinpoint/targeting/database/EventTable.kt → ...work/pinpoint/core/database/EventTable.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting.database
+package com.amplifyframework.pinpoint.core.database
 
 import android.database.sqlite.SQLiteDatabase
 import androidx.annotation.RestrictTo

diff --git a/...nt/targeting/database/PinpointDatabase.kt → ...inpoint/core/database/PinpointDatabase.kt b/...nt/targeting/database/PinpointDatabase.kt → ...inpoint/core/database/PinpointDatabase.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting.database
+package com.amplifyframework.pinpoint.core.database
 
 import android.content.ContentValues
 import android.content.Context
@@ -23,7 +23,7 @@ import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteQueryBuilder
 import android.net.Uri
 import androidx.annotation.RestrictTo
-import com.amplifyframework.analytics.pinpoint.targeting.models.PinpointEvent
+import com.amplifyframework.pinpoint.core.models.PinpointEvent
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

diff --git a/...geting/database/PinpointDatabaseHelper.kt → ...t/core/database/PinpointDatabaseHelper.kt b/...geting/database/PinpointDatabaseHelper.kt → ...t/core/database/PinpointDatabaseHelper.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting.database
+package com.amplifyframework.pinpoint.core.database
 
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase

diff --git a/...geting/endpointProfile/EndpointProfile.kt → ...t/core/endpointProfile/EndpointProfile.kt b/...geting/endpointProfile/EndpointProfile.kt → ...t/core/endpointProfile/EndpointProfile.kt
@@ -13,15 +13,15 @@
  *  permissions and limitations under the License.
  *
  */
-package com.amplifyframework.analytics.pinpoint.targeting.endpointProfile
+package com.amplifyframework.pinpoint.core.endpointProfile
 
 import android.content.Context
 import androidx.annotation.RestrictTo
 import aws.sdk.kotlin.services.pinpoint.model.ChannelType
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidAppDetails
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidDeviceDetails
-import com.amplifyframework.analytics.pinpoint.targeting.util.millisToIsoDate
 import com.amplifyframework.core.Amplify
+import com.amplifyframework.pinpoint.core.data.AndroidAppDetails
+import com.amplifyframework.pinpoint.core.data.AndroidDeviceDetails
+import com.amplifyframework.pinpoint.core.util.millisToIsoDate
 import java.util.Collections
 import java.util.MissingResourceException
 import java.util.concurrent.ConcurrentHashMap

diff --git a/...ointProfile/EndpointProfileDemographic.kt → ...ointProfile/EndpointProfileDemographic.kt b/...ointProfile/EndpointProfileDemographic.kt → ...ointProfile/EndpointProfileDemographic.kt
@@ -13,12 +13,12 @@
  *  permissions and limitations under the License.
  *
  */
-package com.amplifyframework.analytics.pinpoint.targeting.endpointProfile
+package com.amplifyframework.pinpoint.core.endpointProfile
 
 import android.os.Build
 import androidx.annotation.RestrictTo
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidAppDetails
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidDeviceDetails
+import com.amplifyframework.pinpoint.core.data.AndroidAppDetails
+import com.amplifyframework.pinpoint.core.data.AndroidDeviceDetails
 import java.util.TimeZone
 import kotlinx.serialization.Serializable
 

diff --git a/...ndpointProfile/EndpointProfileLocation.kt → ...ndpointProfile/EndpointProfileLocation.kt b/...ndpointProfile/EndpointProfileLocation.kt → ...ndpointProfile/EndpointProfileLocation.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  *
  */
-package com.amplifyframework.analytics.pinpoint.targeting.endpointProfile
+package com.amplifyframework.pinpoint.core.endpointProfile
 
 import androidx.annotation.RestrictTo
 import kotlinx.serialization.Serializable

diff --git a/...ng/endpointProfile/EndpointProfileUser.kt → ...re/endpointProfile/EndpointProfileUser.kt b/...ng/endpointProfile/EndpointProfileUser.kt → ...re/endpointProfile/EndpointProfileUser.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  *
  */
-package com.amplifyframework.analytics.pinpoint.targeting.endpointProfile
+package com.amplifyframework.pinpoint.core.endpointProfile
 
 import androidx.annotation.RestrictTo
 import java.util.concurrent.ConcurrentHashMap

diff --git a/.../models/AWSPinpointUserProfileBehavior.kt → .../models/AWSPinpointUserProfileBehavior.kt b/.../models/AWSPinpointUserProfileBehavior.kt → .../models/AWSPinpointUserProfileBehavior.kt
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amplifyframework.analytics.pinpoint.targeting.models
+package com.amplifyframework.pinpoint.core.models
 
 import androidx.annotation.RestrictTo
 import com.amplifyframework.analytics.AnalyticsProperties

diff --git a/...inpoint/targeting/models/PinpointEvent.kt → ...ork/pinpoint/core/models/PinpointEvent.kt b/...inpoint/targeting/models/PinpointEvent.kt → ...ork/pinpoint/core/models/PinpointEvent.kt
@@ -12,11 +12,11 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amplifyframework.analytics.pinpoint.targeting.models
+package com.amplifyframework.pinpoint.core.models
 
 import androidx.annotation.RestrictTo
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidAppDetails
-import com.amplifyframework.analytics.pinpoint.targeting.data.AndroidDeviceDetails
+import com.amplifyframework.pinpoint.core.data.AndroidAppDetails
+import com.amplifyframework.pinpoint.core.data.AndroidDeviceDetails
 import java.util.UUID
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable