dev to staging (v2.0.2) (#30) (#32)

* Added support for X-EXC-SDK and X-EXC-SDK-Version headers (#29) * Update build.gradle * Added support for X-EXC-SDK and X-EXC-SDK-Version headers * Fixed minor checkstyle issue * Fixed failing unit tests * Minor fixes * Using the Core API for fetching the extension version in functional tests * cleanup * Feedback updates --------- * Added tests to bump up coverage when using Target headers (#31) * Update build.gradle * Bump up coverage for MOB-18912 --------- --------- Co-authored-by: Ryan Morales <rymorale@adobe.com> Co-authored-by: Praveen <praveek@users.noreply.github.com>
adobe · Oct 20, 2023 · aff0208 · aff0208
1 parent f948244
commit aff0208
Show file tree

Hide file tree

Showing 12 changed files with 394 additions and 56 deletions.
diff --git a/code/build.gradle b/code/build.gradle
@@ -23,7 +23,7 @@ buildscript {
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
     }
 }
@@ -82,7 +82,7 @@ ext {
 
     // dependencies
     junitVersion = "1.1.3"
-    buildToolsVersion = "30.0.2"
+    mockitoCoreVersion = "4.5.1"
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     jacocoVersion = "0.8.7"
 }
diff --git a/code/gradle.properties b/code/gradle.properties
@@ -28,7 +28,7 @@ android.useAndroidX=true
 moduleProjectName=target
 moduleName=target
 moduleAARName=target-phone-release.aar
-moduleVersion=2.0.1
+moduleVersion=2.0.2
 
 mavenRepoName=AdobeMobileTargetSdk
 mavenRepoDescription=Adobe Experience Platform Target extension for the Adobe Experience Platform Mobile SDK

diff --git a/code/gradle/wrapper/gradle-wrapper.properties b/code/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 24 12:09:09 PDT 2021
+#Wed Oct 11 21:18:19 PDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
diff --git a/code/target/build.gradle b/code/target/build.gradle
@@ -27,7 +27,6 @@ jacoco {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -228,14 +227,14 @@ dependencies {
     implementation 'com.adobe.marketing.mobile:core:2.0.1'
 
     testImplementation "androidx.test.ext:junit:${rootProject.ext.junitVersion}"
+    testImplementation "org.mockito:mockito-core:${rootProject.ext.mockitoCoreVersion}"
+    testImplementation "org.mockito:mockito-inline:${rootProject.ext.mockitoCoreVersion}"
     testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.9'
-    testImplementation "org.mockito:mockito-core:4.5.1"
-    testImplementation 'org.mockito:mockito-inline:4.5.1'
     testImplementation 'org.json:json:20180813'
 
     androidTestImplementation 'com.adobe.marketing.mobile:identity:2.0.0'
     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'
 }