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

3.0.0 release final dev-v3.0.0 -> staging

.circleci/config.yml

@@ -50,6 +50,16 @@ workflows:
               only:
                 - main
                 - staging
+
+      - build-test-app:
+          requires:
+            - validate-code
+          filters:
+            branches:
+              only:
+                - main
+                - staging
+
 
 jobs:
   validate-code:
@@ -109,10 +119,6 @@ jobs:
           name: Assemble Phone
           command: make assemble-phone
 
-      - run:
-          name: Assemble App
-          command: make assemble-app
-
       - android/run-tests:
           test-command: make unit-test-coverage
 
@@ -180,7 +186,7 @@ jobs:
     executor:
       name: android/android-machine
       resource-class: large
-      tag: 2022.09.1
+      tag: 2024.01.1
     steps:
       - checkout
 
@@ -206,3 +212,26 @@ jobs:
       # On test failures, the step in the Makefile to copy the reports to ci/ is not run, so store test results from build folder instead.
       - store_test_results:
           path: code/integration-tests/build/outputs/androidTest-results/connected
+
+  build-test-app:
+
+    executor:
+      name: android/android-docker
+      tag: 2024.01.1-node
+
+    steps:
+      - checkout
+
+      - android/restore-gradle-cache:
+          cache-prefix: << pipeline.parameters.gradle-cache-prefix >>
+      - android/restore-build-cache:
+          cache-prefix: << pipeline.parameters.build-cache-prefix >>
+
+      - run:
+          name: Assemble App
+          command: make assemble-app
+
+      - android/save-gradle-cache:
+          cache-prefix: << pipeline.parameters.gradle-cache-prefix >>
+      - android/save-build-cache:
+          cache-prefix: << pipeline.parameters.build-cache-prefix >>

Documentation/getting-started.md

@@ -44,13 +44,24 @@ The Edge Network extension depends on the following extensions:
 
 1. Add the Mobile Core, Identity for Edge Network, and Edge Network extensions to your project using the app's Gradle file:
 
+#### Kotlin
+
 ```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")
 ```
 
+#### Groovy
+
+```groovy
+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.
 

README.md

@@ -41,7 +41,6 @@ make init
 | [Lifecycle for Edge Network](https://github.com/adobe/aepsdk-core-android)               | The Lifecycle for Edge Network extension helps collect application Lifecycle metrics and any additional context data provided by the application developer when using the Mobile SDK and the Edge Network extension. |
 | [Identity for Edge Network](https://github.com/adobe/aepsdk-edgeidentity-android)        | The Identity for Edge Network extension enables identity management from a mobile app when using the Edge Network extension. |
 | [Assurance extension](https://github.com/adobe/aepsdk-assurance-android)           | The Assurance extension enables validation workflows for your Mobile SDK implementation. |
-| [Adobe Experience Platform Android sample app](https://github.com/adobe/aepsdk-sample-app-android) | Contains Android sample app for the Mobile SDKs. |
 
 ## Documentation
 

code/app-kotlin/build.gradle.kts

@@ -79,10 +79,15 @@ dependencies {
     implementation("com.adobe.marketing.mobile:edgeidentity:$mavenEdgeIdentityVersion-SNAPSHOT") {
         exclude(group = "com.adobe.marketing.mobile", module = "core")
     }
-    implementation("com.adobe.marketing.mobile:edgeconsent:2.0.0") {
+    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:3.0.0-SNAPSHOT") {
+        exclude(group = "com.adobe.marketing.mobile", module = "core")
     }
-    implementation("com.adobe.marketing.mobile:assurance:2.2.1")
+
+    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
 
     implementation("com.google.code.gson:gson:2.8.9")
 }

code/app/build.gradle.kts

@@ -76,10 +76,15 @@ dependencies {
     implementation("com.adobe.marketing.mobile:edgeidentity:$mavenEdgeIdentityVersion-SNAPSHOT") {
         exclude(group = "com.adobe.marketing.mobile", module = "core")
     }
-    implementation("com.adobe.marketing.mobile:edgeconsent:2.0.0") {
+    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:3.0.0-SNAPSHOT") {
+        exclude(group = "com.adobe.marketing.mobile", module = "core")
     }
-    implementation("com.adobe.marketing.mobile:assurance:2.2.1")
+
+    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
 
     implementation("com.google.code.gson:gson:2.8.9")
 }

code/build.gradle.kts

@@ -21,6 +21,6 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath("com.github.adobe:aepsdk-commons:884c937705")
+        classpath("com.github.adobe:aepsdk-commons:gp-3.0.0")
     }
 }

code/edge/build.gradle.kts

@@ -41,5 +41,9 @@ dependencies {
     testImplementation("com.fasterxml.jackson.core:jackson-databind:2.12.7")
 
     androidTestImplementation(project(":test-utils"))
-    androidTestImplementation("com.adobe.marketing.mobile:edgeconsent:2.0.0")
+    androidTestImplementation("com.adobe.marketing.mobile:edgeconsent:3.0.0-SNAPSHOT")
+    {
+        exclude(group = "com.adobe.marketing.mobile", module = "core")
+        exclude(group = "com.adobe.marketing.mobile", module = "edge")
+    }
 }

code/gradle.properties

@@ -24,8 +24,6 @@ mavenRepoDescription=Adobe Experience Platform Edge extension for the Adobe Expe
 mavenUploadDryRunFlag=false
 
 android.useAndroidX=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
 
 # Upstream integration test variables (without double quotes)
 # Set in system environment to override default empty values

code/upstream-integration-tests/build.gradle.kts

@@ -86,9 +86,10 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.9.0")
 
-    androidTestImplementation("com.adobe.marketing.mobile:core:2.6.2")
-    androidTestImplementation("com.adobe.marketing.mobile:edgeidentity:2.0.1")
-
+    androidTestImplementation("com.adobe.marketing.mobile:core:3.0.0-SNAPSHOT")
+    androidTestImplementation("com.adobe.marketing.mobile:edgeidentity:3.0.0-SNAPSHOT"){
+        exclude(group = "com.adobe.marketing.mobile", module = "core")
+    }
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
     androidTestImplementation("androidx.test:runner:1.4.0")