Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dependency updates to Staging #79

Merged
merged 1 commit into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Documentation/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Optionally, the Media for Edge Network configuration may be set or changed progr

1. 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. Add the Mobile Core, Edge, EdgeIdentity, and EdgeMedia extensions to your project using the app's Gradle file:

### Kotlin
#### Kotlin

```kotlin
implementation(platform("com.adobe.marketing.mobile:sdk-bom:3.+"))
Expand All @@ -63,7 +63,7 @@ Optionally, the Media for Edge Network configuration may be set or changed progr
implementation("com.adobe.marketing.mobile:edgemedia")
```

### Groovy
#### Groovy

```groovy
implementation platform('com.adobe.marketing.mobile:sdk-bom:3.+')
Expand All @@ -78,7 +78,7 @@ Optionally, the Media for Edge Network configuration may be set or changed progr

2. Import the libraries:

### Java
#### Java

```java
import com.adobe.marketing.mobile.MobileCore;
Expand All @@ -87,7 +87,7 @@ Optionally, the Media for Edge Network configuration may be set or changed progr
import com.adobe.marketing.mobile.edge.media.Media;
```

### Kotlin
#### Kotlin

```kotlin
import com.adobe.marketing.mobile.MobileCore
Expand All @@ -98,7 +98,7 @@ Optionally, the Media for Edge Network configuration may be set or changed progr

3. Import the Media library into your project and register it with `MobileCore`

### Java
#### Java

```java
public class MainApp extends Application {
Expand All @@ -120,7 +120,7 @@ Optionally, the Media for Edge Network configuration may be set or changed progr
}
```

### Kotlin
#### Kotlin

```kotlin
class MyApp : Application() {
Expand Down
17 changes: 3 additions & 14 deletions code/edgemedia/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,10 @@ aepLibrary {
}

dependencies {
// Stop using snapshots after core, edge and edge identity release.
implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion-SNAPSHOT")
implementation("com.adobe.marketing.mobile:edge:$mavenEdgeVersion-SNAPSHOT"){
exclude(group = "com.adobe.marketing.mobile", module = "core")
exclude(group = "com.adobe.marketing.mobile", module = "edgeidentity")
}
implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion")
implementation("com.adobe.marketing.mobile:edge:$mavenEdgeVersion")

androidTestImplementation("com.adobe.marketing.mobile:edge:$mavenEdgeVersion-SNAPSHOT"){
exclude(group = "com.adobe.marketing.mobile", module = "core")
exclude(group = "com.adobe.marketing.mobile", module = "edgeidentity")
}
// Update it to 3.+ after release
androidTestImplementation("com.adobe.marketing.mobile:edgeidentity:3.0.0-SNAPSHOT"){
exclude(group = "com.adobe.marketing.mobile", module = "core")
}
androidTestImplementation("com.adobe.marketing.mobile:edgeidentity:3.0.0")
emdobrin marked this conversation as resolved.
Show resolved Hide resolved
androidTestImplementation("com.fasterxml.jackson.core:jackson-databind:2.12.7")

testImplementation("org.jetbrains.kotlin:kotlin-reflect:${BuildConstants.Versions.KOTLIN}")
Expand Down
18 changes: 7 additions & 11 deletions code/testapp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ plugins {
id("com.diffplug.spotless")
}

val mavenCoreVersion: String by project
val mavenEdgeVersion: String by project

configure<com.diffplug.gradle.spotless.SpotlessExtension> {
java {
target("src/*/java/**/*.java")
Expand Down Expand Up @@ -62,16 +65,9 @@ dependencies {
implementation("androidx.appcompat:appcompat:1.6.1")

implementation(project(":edgemedia"))
implementation("com.adobe.marketing.mobile:core:3.0.0-SNAPSHOT")
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("com.adobe.marketing.mobile:edgeidentity:3.0.0-SNAPSHOT") {
exclude(group = "com.adobe.marketing.mobile", module = "core")
}
implementation("com.adobe.marketing.mobile:assurance:3.0.0-SNAPSHOT") {
exclude(group = "com.adobe.marketing.mobile", module = "core")
}
implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion")
implementation("com.adobe.marketing.mobile:edge:$mavenEdgeVersion")
implementation("com.adobe.marketing.mobile:edgeidentity:3.0.0")
implementation("com.adobe.marketing.mobile:assurance:3.0.0")
}