Merge pull request #121 from adobe/dev-v3.0.0

dev-v3.0.0 --> staging : doc changes and snapshot update in the app
adobe · Mar 8, 2024 · 4cd1054 · 4cd1054
2 parents bdffcab + 99d4493
commit 4cd1054
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 52 deletions.
diff --git a/Documentation/api-reference.md b/Documentation/api-reference.md
@@ -12,7 +12,6 @@ Refer to the [Getting Started Guide](getting-started.md)
 | [getExperienceCloudId](#getExperienceCloudId)         |
 | [getIdentities](#getIdentities)                       |
 | [getUrlVariables](#getUrlVariables)                   |
-| [registerExtension](#registerExtension)               |
 | [removeIdentity](#removeIdentity)                     |
 | [resetIdentities](#resetIdentities)                   |
 | [setAdvertisingIdentifier](#setAdvertisingIdentifier) |
@@ -167,40 +166,6 @@ Identity.getUrlVariables { urlVariablesString ->
 
 ------
 
-### registerExtension
-
-Registers the Identity for Edge Network extension with the Mobile Core extension.
-
-> **Warning**
-> Deprecated as of 2.0.0. Use the [MobileCore.registerExtensions API](https://github.com/adobe/aepsdk-core-android/blob/main/Documentation/MobileCore/api-reference.md) instead.
-
-> **Note**
-> If your use-case covers both Edge Network and Adobe Experience Cloud Solutions extensions, you need to register Identity for Edge Network and Identity for Experience Cloud Identity Service from Mobile Core extensions. For more details, see the [frequently asked questions](frequently-asked-questions.md).
-
-#### Java
-
-##### Syntax
-```java
-public static void registerExtension()
-```
-
-##### Example
-```java
-import com.adobe.marketing.mobile.edge.identity.Identity
-
-...
-Identity.registerExtension();
-```
-
-#### Kotlin
-
-##### Example
-```kotlin
-Identity.registerExtension()
-```
-
-------
-
 ### removeIdentity
 
 Remove the identity from the stored client-side [IdentityMap](#identitymap). The Identity extension will stop sending the identifier to the Edge Network. Using this API does not remove the identifier from the server-side User Profile Graph or Identity Graph.

diff --git a/Documentation/frequently-asked-questions.md b/Documentation/frequently-asked-questions.md
@@ -14,11 +14,12 @@ Download and import the Identity and Identity for Edge Network extensions
 
 1. Add the Mobile Core and Edge extensions to your project using the app's Gradle file.
 
-   ```java
-    implementation 'com.adobe.marketing.mobile:core:2.+'
-    implementation 'com.adobe.marketing.mobile:identity:2.+'
-    implementation 'com.adobe.marketing.mobile:edge:2.+'
-    implementation 'com.adobe.marketing.mobile:edgeidentity:2.+'
+   ```kotlin
+    implementation(platform("com.adobe.marketing.mobile:sdk-bom:3.+"))
+    implementation("com.adobe.marketing.mobile:core")
+    implementation("com.adobe.marketing.mobile:identity")
+    implementation("com.adobe.marketing.mobile:edge")
+    implementation("com.adobe.marketing.mobile:edgeidentity")
    ```
 > **Warning**
 > Using dynamic dependency versions is not recommended for production apps. Refer to this [page](https://github.com/adobe/aepsdk-core-android/blob/main/Documentation/MobileCore/gradle-dependencies.md) for managing gradle dependencies.

diff --git a/Documentation/getting-started.md b/Documentation/getting-started.md
@@ -23,11 +23,12 @@ The Adobe Experience Platform Identity for Edge Network extension depends on the
 
 1. Add the Mobile Core, Edge, and Edge Identity extensions to your project using the app's Gradle file:
 
-```gradle
-implementation 'com.adobe.marketing.mobile:core:2.+'
-implementation 'com.adobe.marketing.mobile:edge:2.+'
-implementation 'com.adobe.marketing.mobile:edgeidentity:2.+'
-   ```
+```kotlin
+implementation(platform("com.adobe.marketing.mobile:sdk-bom:3.+"))
+implementation("com.adobe.marketing.mobile:core")
+implementation("com.adobe.marketing.mobile:edge")
+implementation("com.adobe.marketing.mobile:edgeidentity")   
+```
 > **Warning**
 > Using dynamic dependency versions is not recommended for production apps. Refer to this [page](https://github.com/adobe/aepsdk-core-android/blob/main/Documentation/MobileCore/gradle-dependencies.md) for managing gradle dependencies.
 

diff --git a/code/app/build.gradle.kts b/code/app/build.gradle.kts
@@ -70,12 +70,16 @@ dependencies {
     implementation(project(":edgeidentity"))
 
     implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion-SNAPSHOT")
-    implementation("com.adobe.marketing.mobile:identity:2.+")
-    implementation("com.adobe.marketing.mobile:edgeconsent:2.0.0") {
+    implementation("com.adobe.marketing.mobile:identity:3.0.0-SNAPSHOT") {
+        exclude(group = "com.adobe.marketing.mobile", module = "core")
+    }
+    implementation("com.adobe.marketing.mobile:edgeconsent:3.0.0-SNAPSHOT") {
         exclude(group = "com.adobe.marketing.mobile", module = "edge")
+        exclude(group = "com.adobe.marketing.mobile", module = "core")
+
     }
     implementation("com.adobe.marketing.mobile:assurance:2.+")
-    implementation("com.adobe.marketing.mobile:edge:2.0.0") {
+    implementation("com.adobe.marketing.mobile:edge:3.0.0-SNAPSHOT") {
         exclude(group = "com.adobe.marketing.mobile", module = "core")
         exclude(group = "com.adobe.marketing.mobile", module = "edgeidentity")
     }

diff --git a/...pp/src/main/java/com/adobe/marketing/edge/identity/testapp/ui/MultipleIdentityFragment.kt b/...pp/src/main/java/com/adobe/marketing/edge/identity/testapp/ui/MultipleIdentityFragment.kt
@@ -25,9 +25,11 @@ import com.adobe.marketing.edge.identity.testapp.R
 import com.adobe.marketing.edge.identity.testapp.model.SharedViewModel
 import com.adobe.marketing.mobile.Edge
 import com.adobe.marketing.mobile.ExperienceEvent
+import com.adobe.marketing.mobile.Extension
 import com.adobe.marketing.mobile.MobileCore
 import com.adobe.marketing.mobile.MobilePrivacyStatus
 import com.adobe.marketing.mobile.VisitorID
+import java.util.Arrays
 import kotlin.random.Random
 
 class MultipleIdentityFragment : Fragment() {
@@ -77,7 +79,10 @@ class MultipleIdentityFragment : Fragment() {
         directRegisteredRadioButton.setOnClickListener {
             // There is no API to unregister an extension, so only handle registration case
             if (sharedViewModel.isDirectIdentityRegistered.value == false) {
-                com.adobe.marketing.mobile.Identity.registerExtension()
+                val extensions: List<Class<out Extension?>> = Arrays.asList(
+                    com.adobe.marketing.mobile.Identity.EXTENSION,
+                )
+                MobileCore.registerExtensions(extensions) {}
                 sharedViewModel.toggleDirectIdentityRegistration()
             }
         }

diff --git a/code/edgeidentity/build.gradle.kts b/code/edgeidentity/build.gradle.kts
@@ -14,6 +14,7 @@ plugins {
 }
 
 val mavenCoreVersion: String by project
+val functionalTestIdentityVersion: String by project
 
 aepLibrary {
     namespace = "com.adobe.marketing.mobile.edge.identity"
@@ -40,5 +41,8 @@ dependencies {
     // ANDROIDX_TEST_EXT_JUNIT, ESPRESSO_CORE
 
     androidTestImplementation ("com.fasterxml.jackson.core:jackson-databind:2.12.7")
-    androidTestImplementation ("com.adobe.marketing.mobile:identity:2.+")
+    androidTestImplementation("com.adobe.marketing.mobile:identity:$functionalTestIdentityVersion-SNAPSHOT")
+    {
+        exclude(group = "com.adobe.marketing.mobile", module = "core")
+    }
 }
diff --git a/code/gradle.properties b/code/gradle.properties
@@ -21,5 +21,4 @@ mavenRepoDescription=Adobe Experience Platform Edge Identity extension for the A
 mavenUploadDryRunFlag=false
 
 android.useAndroidX=true
-
-
+functionalTestIdentityVersion=3.0.0