Skip to content

Commit

Permalink
Merge pull request #127 from adobe/staging-v3-dep-updates
Browse files Browse the repository at this point in the history
Merge dependency updates to Staging
  • Loading branch information
kevinlind committed Apr 2, 2024
2 parents 16348b2 + da9daa8 commit 6681b12
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Integrate the Identity for Edge Network mobile extension into your app by follow

**Open the project**

To open and run the project, open the `code/settings.gradle` file in Android Studio.
To open and run the project, open the `code/settings.gradle.kt` file in Android Studio.

**Run the test app**

Expand Down
11 changes: 3 additions & 8 deletions code/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,13 @@ dependencies {
implementation("com.google.android.material:material:1.3.0")
implementation(project(":edgeidentity"))

implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion-SNAPSHOT")
implementation("com.adobe.marketing.mobile:identity:3.0.0-SNAPSHOT") {
exclude(group = "com.adobe.marketing.mobile", module = "core")
}
implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion")
implementation("com.adobe.marketing.mobile:identity:3.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:2.+")
implementation("com.adobe.marketing.mobile:assurance:3.0.0")
implementation("com.adobe.marketing.mobile:edge:3.0.0-SNAPSHOT") {
exclude(group = "com.adobe.marketing.mobile", module = "core")
exclude(group = "com.adobe.marketing.mobile", module = "edgeidentity")
}
implementation("androidx.core:core-ktx:1.3.2")
Expand Down
9 changes: 2 additions & 7 deletions code/edgeidentity/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ aepLibrary {
}

dependencies {
// TODO: Use 3.x versions for testing
// TODO: Remove -SNAPSHOT suffix after Core 3.0.0 is published
implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion-SNAPSHOT")
implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion")

// testImplementation dependencies provided by aep-library:
// MOCKITO_CORE, JSON, ANDROIDX_TEST_EXT_JUNIT
Expand All @@ -41,8 +39,5 @@ dependencies {
// ANDROIDX_TEST_EXT_JUNIT, ESPRESSO_CORE

androidTestImplementation ("com.fasterxml.jackson.core:jackson-databind:2.12.7")
androidTestImplementation("com.adobe.marketing.mobile:identity:$functionalTestIdentityVersion-SNAPSHOT")
{
exclude(group = "com.adobe.marketing.mobile", module = "core")
}
androidTestImplementation("com.adobe.marketing.mobile:identity:$functionalTestIdentityVersion")
}

0 comments on commit 6681b12

Please sign in to comment.