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

Merge dev -> staging
adobe · Mar 26, 2024 · 69c2f69 · 69c2f69
2 parents fa5fccb + bd38e8c
commit 69c2f69
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 136 deletions.
diff --git a/Documentation/Debugging.md b/Documentation/Debugging.md
@@ -6,18 +6,19 @@ The AEP SDK offers an extension to quickly inspect, validate, debug data collect
 
 #### Add Assurance to your app
 
-Installation via [Maven](https://maven.apache.org/) & [Gradle](https://gradle.org/) is the easiest and recommended way to get the AEP SDK into your Android app. In your `build.gradle` file, include the latest version of following dependency:
+Installation via [Maven](https://maven.apache.org/) & [Gradle](https://gradle.org/) is the easiest and recommended way to get the AEP SDK into your Android app. In your `build.gradle` file, include the latest version of Assurance:
 
-```
-implementation 'com.adobe.marketing.mobile:assurance:2.x.x'
+##### Kotlin
+```kotlin
+implementation(platform("com.adobe.marketing.mobile:sdk-bom:3.+"))
+implementation("com.adobe.marketing.mobile:assurance")
 ```
 
-**Note**: Assurance SDK displays some UI components using the source app context. If you see an error similar to
-
-```
-AAPT: error: attribute layout_constraintStart_toStartOf (aka <your_app_name>:layout_constraintStart_toStartOf) not found
+##### Groovy
+```groovy
+implementation platform('com.adobe.marketing.mobile:sdk-bom:3.+')
+implementation 'com.adobe.marketing.mobile:assurance'
 ```
-while building your app with Assurance SDK, include a dependency on `implementation 'androidx.constraintlayout:constraintlayout:1.x.x'` in your app.
 
 #### Update Extension Registration
 

diff --git a/Documentation/Migration.md b/Documentation/Migration.md
diff --git a/Documentation/MobileCore/getting-started.md b/Documentation/MobileCore/getting-started.md
@@ -2,7 +2,7 @@
 
 This guide walks through how to get up and running with the AEP Android SDK with only a few lines of code.
 
-> Existing ACP SDK customers should check out the [migration document](../Migration.md).
+> For customers using previous versions of the Android SDK, it is recommended to first review the [migration document](https://developer.adobe.com/client-sdks/resources/migration/android/). 
 
 ## Set up a Mobile Property
 
@@ -16,12 +16,26 @@ If you cannot access the Mobile Install Instructions dialog box in the Data Coll
 
 1. Each extension needs to be added as a dependency to the mobile application project. The following examples will add the Mobile Core, Lifecycle, Identity, Signal and Profile extensions.
 
-```java
-implementation 'com.adobe.marketing.mobile:userprofile:2.+'
-implementation 'com.adobe.marketing.mobile:core:2.+'
-implementation 'com.adobe.marketing.mobile:identity:2.+'
-implementation 'com.adobe.marketing.mobile:signal:2.+'
-implementation 'com.adobe.marketing.mobile:lifecycle:2.+'
+### Kotlin
+
+```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:signal")
+implementation("com.adobe.marketing.mobile:lifecycle")
+implementation("com.adobe.marketing.mobile:userprofile")
+```
+
+### Groovy
+
+```groovy
+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:signal'
+implementation 'com.adobe.marketing.mobile:lifecycle'
+implementation 'com.adobe.marketing.mobile:userprofile'
 ```
 
 > **Warning**
@@ -125,12 +139,6 @@ override fun onPause() {
 }
 ```
 
-## Sample Apps
-
-To download more examples of integrating the AEP Android SDK, head over to the sample app resources.
-
-[View Samples](https://github.com/adobe/aepsdk-sample-app-android)
-
 ## Next Steps
 
 - Get familiar with the various APIs offered by the AEP SDK by checking out the [Mobile Core API reference](./api-reference.md).

diff --git a/Documentation/README.md b/Documentation/README.md
@@ -6,7 +6,6 @@
     * [Getting Started](./MobileCore/getting-started.md)
     * [Managing Gradle Dependencies](./MobileCore/gradle-dependencies.md)
     * [API Usage](./MobileCore/api-reference.md)
-    * [Migrating from ACPCore to AEPCore](./Migration.md)
     * [Validation via Assurance](./Debugging.md)
 * [Architecture](./Architecture.md)
     * [EventHub](./EventHub/README.md)

diff --git a/code/build.gradle.kts b/code/build.gradle.kts
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.github.adobe:aepsdk-commons:gp-3.0.0-beta.2")
+        classpath("com.github.adobe:aepsdk-commons:gp-3.0.0")
         classpath("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2")
         classpath("androidx.benchmark:benchmark-gradle-plugin:1.2.3")
     }

diff --git a/code/core/src/phone/java/com/adobe/marketing/mobile/services/DeviceInfoService.java b/code/core/src/phone/java/com/adobe/marketing/mobile/services/DeviceInfoService.java
@@ -21,12 +21,12 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
+import com.adobe.marketing.mobile.internal.util.NetworkUtils;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -214,71 +214,15 @@ public String getMobileCarrierName() {
 
     @Override
     public ConnectionStatus getNetworkConnectionStatus() {
-        final Context context = getApplicationContext();
-
-        if (context == null) {
-            return DeviceInfoService.ConnectionStatus.UNKNOWN;
-        }
-
-        try {
-            // We have a context so ask the system for an instance of ConnectivityManager
-            ConnectivityManager connectivityManager =
-                    (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-            if (connectivityManager != null) {
-                // We have an instance of ConnectivityManager so now we can ask for the active
-                // network info
-                NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
-
-                if (activeNetworkInfo != null) {
-                    // At this point we have everything that we need to accurately determine the
-                    // current connectivity status
-                    return activeNetworkInfo.isAvailable() && activeNetworkInfo.isConnected()
-                            ? DeviceInfoService.ConnectionStatus.CONNECTED
-                            : DeviceInfoService.ConnectionStatus.DISCONNECTED;
-                } else {
-                    // Per Android documentation getActiveNetworkInfo() will return null if no
-                    // default network is currently active.
-                    // If no default network is currently active we can assume that we don't have
-                    // connectivity.
-                    Log.debug(
-                            ServiceConstants.LOG_TAG,
-                            LOG_TAG,
-                            "Unable to determine connectivity status due to there being no default"
-                                    + " network currently active");
-                }
-            } else {
-                Log.debug(
-                        ServiceConstants.LOG_TAG,
-                        LOG_TAG,
-                        "Unable to determine connectivity status due to the system service"
-                                + " requested being unrecognized");
-            }
-        } catch (NullPointerException e) {
-            Log.debug(
-                    ServiceConstants.LOG_TAG,
-                    LOG_TAG,
-                    String.format(
-                            "Unable to determine connectivity status due to an unexpected error"
-                                    + " (%s)",
-                            e.getLocalizedMessage()));
-        } catch (SecurityException e) {
-            Log.debug(
-                    ServiceConstants.LOG_TAG,
-                    LOG_TAG,
-                    String.format(
-                            "Unable to access connectivity status due to a security error (%s)",
-                            e.getLocalizedMessage()));
-        } catch (Exception e) {
-            Log.debug(
-                    ServiceConstants.LOG_TAG,
-                    LOG_TAG,
-                    String.format(
-                            "Unable to access connectivity status due to an unexpected error (%s)",
-                            e.getLocalizedMessage()));
+        ConnectivityManager connectivityManager =
+                ServiceProvider.getInstance().getAppContextService().getConnectivityManager();
+        if (connectivityManager == null) {
+            return ConnectionStatus.UNKNOWN;
         }
 
-        return DeviceInfoService.ConnectionStatus.UNKNOWN;
+        return NetworkUtils.isInternetAvailable(connectivityManager)
+                ? ConnectionStatus.CONNECTED
+                : ConnectionStatus.DISCONNECTED;
     }
 
     @Override

diff --git a/code/gradle.properties b/code/gradle.properties
@@ -5,22 +5,22 @@ android.useAndroidX=true
 
 #Maven artifacts
 #Core extension
-coreExtensionVersion=3.0.0-beta.1
+coreExtensionVersion=3.0.0
 coreExtensionName=core
 coreMavenRepoName=AdobeMobileCoreSdk
 coreMavenRepoDescription=Android Core Extension for Adobe Mobile Marketing
 #Signal extension
-signalExtensionVersion=3.0.0-beta.1
+signalExtensionVersion=3.0.0
 signalExtensionName=signal
 signalMavenRepoName=AdobeMobileSignalSdk
 signalMavenRepoDescription=Android Signal Extension for Adobe Mobile Marketing
 #Lifecycle extension
-lifecycleExtensionVersion=3.0.0-beta.1
+lifecycleExtensionVersion=3.0.0
 lifecycleExtensionName=lifecycle
 lifecycleMavenRepoName=AdobeMobileLifecycleSdk
 lifecycleMavenRepoDescription=Android Lifecycle Extension for Adobe Mobile Marketing
 #Identity extension
-identityExtensionVersion=3.0.0-beta.1
+identityExtensionVersion=3.0.0
 identityExtensionName=identity
 identityMavenRepoName=AdobeMobileIdentitySdk
 identityMavenRepoDescription=Android Identity Extension for Adobe Mobile Marketing
diff --git a/code/identity/build.gradle.kts b/code/identity/build.gradle.kts
@@ -18,9 +18,7 @@ aepLibrary {
         mavenRepoName = identityMavenRepoName
         mavenRepoDescription = identityMavenRepoDescription
         gitRepoName = "aepsdk-core-android"
-
-        // Stop using snapshot version after release
-        addCoreDependency("$coreExtensionVersion-SNAPSHOT")
+        addCoreDependency("$coreExtensionVersion")
     }
 }
 

diff --git a/code/lifecycle/build.gradle.kts b/code/lifecycle/build.gradle.kts
@@ -18,9 +18,7 @@ aepLibrary {
         mavenRepoName = lifecycleMavenRepoName
         mavenRepoDescription = lifecycleMavenRepoDescription
         gitRepoName = "aepsdk-core-android"
-
-        // Stop using snapshot version after release
-        addCoreDependency("$coreExtensionVersion-SNAPSHOT")
+        addCoreDependency("$coreExtensionVersion")
     }
 }
 

diff --git a/code/signal/build.gradle.kts b/code/signal/build.gradle.kts
@@ -19,9 +19,7 @@ aepLibrary {
         mavenRepoName = signalMavenRepoName
         mavenRepoDescription = signalMavenRepoDescription
         gitRepoName = "aepsdk-core-android"
-
-        // Stop using snapshot version after release
-        addCoreDependency("$coreExtensionVersion-SNAPSHOT")
+        addCoreDependency("$coreExtensionVersion")
     }
 }