dev to staging (v2.0.2) (#70)

* Fixed processing order for update/ get events in the extension (#69)

* Fixed processing order for update/ get events in the extension

* Resolved checkstyle issues

* minor fix

* remove sample app link from readme.md

* minor fix

* minor fixes + feedback + test updates

* Added more tests to bump up coverage (#71)

* Gradle settings for project and apps (#72)

* Added more tests to bump up coverage

* Gradle settings updates

README.md

@@ -24,7 +24,6 @@ Additional documentation about API usage and SDK architecture can be found under
 
 | Project                                                      | Description                                                  |
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
-| [AEP SDK Sample App for Android](https://github.com/adobe/aepsdk-sample-app-android) | Contains Android sample app for the AEP SDK. |
 | [Core extensions](https://github.com/adobe/aepsdk-core-android)                                    | The Mobile Core represents the foundation of the Experience Platform Mobile SDK. |
 | [Adobe Experience Platform Edge Network Mobile Extension](https://github.com/adobe/aepsdk-edge-android) | The Adobe Experience Platform Edge Network mobile extension allows you to send data to the Experience Platform Edge Network from a mobile application. |
 | [Identity for Edge Network extension](https://github.com/adobe/aepsdk-edgeidentity-android)        | The Identity for Edge Network extension enables handling of user identity data from a mobile app when using the Experience Platform Mobile SDK and the Edge Network extension. |

code/app/build.gradle

@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-def compose_version = '1.3.1'
+def compose_version = '1.3.2'
 
 android {
     compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.adobe.marketing.optimizeapp"
         minSdkVersion 21
-        buildToolsVersion '30.0.2'
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
@@ -41,7 +40,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion '1.7.10'
+        kotlinCompilerVersion '1.7.20'
         kotlinCompilerExtensionVersion compose_version
     }
 
@@ -57,7 +56,7 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.0.0'
     implementation 'com.google.android.material:material:1.7.0'
     implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
+    implementation 'androidx.compose.material:material:1.3.1'
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation "androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha04"
     implementation "androidx.navigation:navigation-compose:2.6.0-alpha04"
@@ -70,10 +69,10 @@ dependencies {
 
     // Adobe mobile SDKs
     implementation project(":optimize")
-    implementation 'com.adobe.marketing.mobile:core:2.3.0'
+    implementation 'com.adobe.marketing.mobile:core:2.5.0'
     implementation 'com.adobe.marketing.mobile:lifecycle:2.0.4'
     implementation 'com.adobe.marketing.mobile:signal:2.0.1'
     implementation 'com.adobe.marketing.mobile:assurance:2.1.1'
-    implementation 'com.adobe.marketing.mobile:edge:2.0.0'
+    implementation 'com.adobe.marketing.mobile:edge:2.3.0'
     implementation 'com.adobe.marketing.mobile:edgeidentity:2.0.1'
 }

code/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -44,7 +44,6 @@ ext {
     // dependencies
     junitVersion = "1.1.3"
     mockitoCoreVersion = "4.5.1"
-    buildToolsVersion = "30.0.2"
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     jacocoVersion = "0.8.7"
 }

code/gradle.properties

@@ -16,13 +16,13 @@ android.useAndroidX=true
 moduleProjectName=optimize
 moduleName=optimize
 moduleAARName=optimize-phone-release.aar
-moduleVersion=2.0.1
+moduleVersion=2.0.2
 
 mavenRepoName=AdobeMobileOptimizeSdk
 mavenRepoDescription=Adobe Experience Platform Optimize extension for the Adobe Experience Platform Mobile SDK
 mavenUploadDryRunFlag=false
 
-mavenCoreVersion=2.0.0
-mavenEdgeVersion=2.0.0
+mavenCoreVersion=2.4.0
+mavenEdgeVersion=2.3.0
 
 android.disableAutomaticComponentCreation=true

code/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

code/optimize/build.gradle

@@ -15,7 +15,6 @@ jacoco {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -207,7 +206,7 @@ task platformFunctionalTestJacocoReport(type: JacocoReport, dependsOn: "createPh
 dependencies {
     implementation 'androidx.annotation:annotation:1.0.0'
 
-    implementation 'com.adobe.marketing.mobile:core:2.0.0'
+    implementation 'com.adobe.marketing.mobile:core:2.4.0'
 
     testImplementation "androidx.test.ext:junit:${rootProject.ext.junitVersion}"
     testImplementation "org.mockito:mockito-core:${rootProject.ext.mockitoCoreVersion}"
@@ -216,10 +215,10 @@ dependencies {
     testImplementation 'org.json:json:20180813'
 
     androidTestImplementation "androidx.test.ext:junit:${rootProject.ext.junitVersion}"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.9'
-    androidTestImplementation 'com.adobe.marketing.mobile:edge:2.0.0'
-    androidTestImplementation 'com.adobe.marketing.mobile:edgeidentity:2.0.0'
+    androidTestImplementation 'com.adobe.marketing.mobile:edge:2.3.0'
+    androidTestImplementation 'com.adobe.marketing.mobile:edgeidentity:2.0.1'
 }
 
 tasks.withType(Test) {