diff --git a/.gitignore b/.gitignore index 74484c94..bbccea0c 100644 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,7 @@ jacoco.exec # Application files *.apk -*.aar *.aab # Dex files for ART/Dalvik VM -*.dex \ No newline at end of file +*.dex diff --git a/code/app/build.gradle b/code/app/build.gradle index 6fe46a51..6bfbb5c2 100644 --- a/code/app/build.gradle +++ b/code/app/build.gradle @@ -44,6 +44,10 @@ android { } } +configurations.all { + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' +} + dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.ext.kotlinVersion}" implementation 'androidx.core:core-ktx:1.3.2' @@ -59,20 +63,15 @@ dependencies { implementation project(':edgeidentity') - // TODO: Uncomment next line when core 2.0 artifacts are published to maven + // TODO: Update these dependencies when all 2.0 artifacts are published to maven // implementation "com.adobe.marketing.mobile:core:${rootProject.mavenCoreVersion}" - implementation 'com.github.adobe.aepsdk-core-android:core:dev-v2.0.0-SNAPSHOT' - - implementation ('com.adobe.marketing.mobile:identity:1+') { - transitive = false - } - implementation('com.adobe.marketing.mobile:edgeconsent:1.+') { - transitive = false - } - implementation('com.adobe.marketing.mobile:edge:1.+') { + implementation 'com.adobe.marketing.mobile:core:2.0.0-SNAPSHOT' + implementation ('com.adobe.marketing.mobile:identity:2.0.0-SNAPSHOT') { transitive = false } - implementation ('com.adobe.marketing.mobile:assurance:1+') { + + implementation fileTree(dir: 'libs', include: ['edge-release-2.0.0.aar', 'edgeconsent-release-2.0.0.aar']) + implementation ('com.adobe.marketing.mobile:assurance:2.0.0-SNAPSHOT') { transitive = false } diff --git a/code/app/libs/edge-release-2.0.0.aar b/code/app/libs/edge-release-2.0.0.aar new file mode 100644 index 00000000..53d50d1d Binary files /dev/null and b/code/app/libs/edge-release-2.0.0.aar differ diff --git a/code/app/libs/edgeconsent-release-2.0.0.aar b/code/app/libs/edgeconsent-release-2.0.0.aar new file mode 100644 index 00000000..cf92d935 Binary files /dev/null and b/code/app/libs/edgeconsent-release-2.0.0.aar differ diff --git a/code/app/src/main/java/com/adobe/marketing/edge/identity/app/EdgeIdentityApplication.kt b/code/app/src/main/java/com/adobe/marketing/edge/identity/app/EdgeIdentityApplication.kt index 74a87125..e315762a 100644 --- a/code/app/src/main/java/com/adobe/marketing/edge/identity/app/EdgeIdentityApplication.kt +++ b/code/app/src/main/java/com/adobe/marketing/edge/identity/app/EdgeIdentityApplication.kt @@ -29,13 +29,9 @@ class EdgeIdentityApplication : Application() { // register AEP SDK extensions MobileCore.setApplication(this) MobileCore.setLogLevel(LoggingMode.VERBOSE) - - Consent.registerExtension() - Identity.registerExtension() - Edge.registerExtension() - Assurance.registerExtension() - - MobileCore.start { + MobileCore.registerExtensions( + listOf(Edge.EXTENSION, Identity.EXTENSION, Consent.EXTENSION, Assurance.EXTENSION) + ) { MobileCore.configureWithAppID(ENVIRONMENT_FILE_ID) } } diff --git a/code/edgeidentity/build.gradle b/code/edgeidentity/build.gradle index 60f72702..1df4984a 100644 --- a/code/edgeidentity/build.gradle +++ b/code/edgeidentity/build.gradle @@ -211,7 +211,7 @@ dependencies { // TODO: Uncomment next line when core 2.0 artifacts are published to maven // implementation "com.adobe.marketing.mobile:core:${rootProject.mavenCoreVersion}" - implementation 'com.github.adobe.aepsdk-core-android:core:dev-v2.0.0-SNAPSHOT' + implementation 'com.adobe.marketing.mobile:core:2.0.0-SNAPSHOT' implementation 'androidx.annotation:annotation:1.3.0' testImplementation "androidx.test.ext:junit:${rootProject.ext.junitVersion}" @@ -225,7 +225,7 @@ dependencies { // TODO: Uncomment next line when Identity 2.0 artifacts are published to maven // implementation "com.adobe.marketing.mobile:identity:2.+" - androidTestImplementation ("com.github.adobe.aepsdk-core-android:identity:dev-v2.0.0-SNAPSHOT") { + androidTestImplementation ('com.adobe.marketing.mobile:identity:2.0.0-SNAPSHOT') { transitive = false } } diff --git a/code/gradle.properties b/code/gradle.properties index 363b6f82..00e42cb4 100644 --- a/code/gradle.properties +++ b/code/gradle.properties @@ -3,7 +3,6 @@ org.gradle.jvmargs=-Xmx2048m android.useAndroidX=true -android.enableJetifier=true android.disableAutomaticComponentCreation=true moduleProjectName=edgeidentity