From 38693db9d137041b9e67c80b19e94b49352ea5cd Mon Sep 17 00:00:00 2001 From: Nickolas Dimitrakas Date: Wed, 24 Jun 2026 11:54:52 -0400 Subject: [PATCH 1/3] feat: pin kit SDK dependencies to current supported ranges --- kits/adjust/adjust-5/build.gradle | 2 +- kits/adobemedia/adobemedia-5/build.gradle | 16 ++++++++-------- kits/appsflyer/appsflyer-6/build.gradle | 2 +- kits/apptentive/apptentive-6/build.gradle | 2 +- kits/apptimize/apptimize-3/build.gradle | 2 +- kits/branch/branch-5/build.gradle | 2 +- kits/braze/braze-38/build.gradle | 2 +- kits/braze/braze-39/build.gradle | 2 +- kits/braze/braze-40/build.gradle | 2 +- kits/braze/braze-41/build.gradle | 2 +- kits/clevertap/clevertap-7/build.gradle | 2 +- kits/comscore/comscore-6/build.gradle | 2 +- kits/ga/ga-23/build.gradle | 4 ++-- kits/ga4/ga4-23/build.gradle | 4 ++-- kits/iterable/iterable-3/build.gradle | 2 +- kits/kochava/kochava-5/build.gradle | 2 +- kits/leanplum/leanplum-7/build.gradle | 2 +- kits/localytics/localytics-6/build.gradle | 2 +- kits/onetrust/onetrust/build.gradle | 4 ++-- kits/optimizely/optimizely-3/build.gradle | 2 +- kits/radar/radar-3/build.gradle | 3 +-- kits/rokt/rokt/build.gradle | 2 +- kits/singular/singular-12/build.gradle | 2 +- kits/urbanairship/urbanairship-20/build.gradle | 2 +- 24 files changed, 34 insertions(+), 35 deletions(-) diff --git a/kits/adjust/adjust-5/build.gradle b/kits/adjust/adjust-5/build.gradle index 8935c6967..cf9323e9e 100644 --- a/kits/adjust/adjust-5/build.gradle +++ b/kits/adjust/adjust-5/build.gradle @@ -58,5 +58,5 @@ android { dependencies { testImplementation files('libs/java-json.jar') - api 'com.adjust.sdk:adjust-android:5.0.0' + api 'com.adjust.sdk:adjust-android:[5.0.0,6.0.0)' } diff --git a/kits/adobemedia/adobemedia-5/build.gradle b/kits/adobemedia/adobemedia-5/build.gradle index 7eef79e48..d8de13401 100644 --- a/kits/adobemedia/adobemedia-5/build.gradle +++ b/kits/adobemedia/adobemedia-5/build.gradle @@ -85,12 +85,12 @@ configurations.all { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api 'com.mparticle:android-media:1.5.0' - api 'com.adobe.marketing.mobile:mobileservices:1.1.5' - api 'com.adobe.marketing.mobile:analytics:3.0.1' - api 'com.adobe.marketing.mobile:media:3.1.0' - api 'com.adobe.marketing.mobile:userprofile:3.0.0' - api 'com.adobe.marketing.mobile:lifecycle:3.0.0' - api 'com.adobe.marketing.mobile:identity:3.0.0' - api 'com.adobe.marketing.mobile:signal:3.0.0' - api 'com.adobe.marketing.mobile:sdk-core:1.11.7' + api 'com.adobe.marketing.mobile:mobileservices:[1.1.5,2.0.0)' + api 'com.adobe.marketing.mobile:analytics:[3.0.1,4.0.0)' + api 'com.adobe.marketing.mobile:media:[3.1.0,4.0.0)' + api 'com.adobe.marketing.mobile:userprofile:[3.0.0,4.0.0)' + api 'com.adobe.marketing.mobile:lifecycle:[3.0.0,4.0.0)' + api 'com.adobe.marketing.mobile:identity:[3.0.0,4.0.0)' + api 'com.adobe.marketing.mobile:signal:[3.0.0,4.0.0)' + api 'com.adobe.marketing.mobile:sdk-core:[1.11.7,2.0.0)' } diff --git a/kits/appsflyer/appsflyer-6/build.gradle b/kits/appsflyer/appsflyer-6/build.gradle index 4829dd8ea..8a90cf1c8 100644 --- a/kits/appsflyer/appsflyer-6/build.gradle +++ b/kits/appsflyer/appsflyer-6/build.gradle @@ -60,7 +60,7 @@ ktlint { } dependencies { - api 'com.appsflyer:af-android-sdk:6.17.3' + api 'com.appsflyer:af-android-sdk:[6.17.3,7.0.0)' testImplementation files('libs/java-json.jar') testImplementation files('libs/testutils.aar') } diff --git a/kits/apptentive/apptentive-6/build.gradle b/kits/apptentive/apptentive-6/build.gradle index 426476841..6ddd18daf 100644 --- a/kits/apptentive/apptentive-6/build.gradle +++ b/kits/apptentive/apptentive-6/build.gradle @@ -64,6 +64,6 @@ allprojects { } dependencies { - api 'com.apptentive:apptentive-kit-android:6.9.1' + api 'com.apptentive:apptentive-kit-android:[6.9.1,7.0.0)' testImplementation 'io.mockk:mockk:1.13.3' } diff --git a/kits/apptimize/apptimize-3/build.gradle b/kits/apptimize/apptimize-3/build.gradle index 3cfb38c70..dfef0bde1 100644 --- a/kits/apptimize/apptimize-3/build.gradle +++ b/kits/apptimize/apptimize-3/build.gradle @@ -62,5 +62,5 @@ repositories { } dependencies { - api 'com.apptimize:apptimize-android:3.10.18@aar' + api 'com.apptimize:apptimize-android:[3.10.18,4.0.0)@aar' } diff --git a/kits/branch/branch-5/build.gradle b/kits/branch/branch-5/build.gradle index e8429b26e..68d278d29 100644 --- a/kits/branch/branch-5/build.gradle +++ b/kits/branch/branch-5/build.gradle @@ -57,5 +57,5 @@ android { } dependencies { - api 'io.branch.sdk.android:library:5.12.0' + api 'io.branch.sdk.android:library:[5.12.0,6.0.0)' } diff --git a/kits/braze/braze-38/build.gradle b/kits/braze/braze-38/build.gradle index b00ecfc9d..57f586f94 100644 --- a/kits/braze/braze-38/build.gradle +++ b/kits/braze/braze-38/build.gradle @@ -67,6 +67,6 @@ repositories { dependencies { compileOnly 'com.google.firebase:firebase-messaging:[10.2.1, )' - api 'com.braze:android-sdk-ui:37.0.0' + api 'com.braze:android-sdk-ui:[37.0.0,38.0.0)' testImplementation files('libs/java-json.jar') } diff --git a/kits/braze/braze-39/build.gradle b/kits/braze/braze-39/build.gradle index ffeff9f1d..4556bde22 100644 --- a/kits/braze/braze-39/build.gradle +++ b/kits/braze/braze-39/build.gradle @@ -67,6 +67,6 @@ repositories { dependencies { compileOnly 'com.google.firebase:firebase-messaging:[10.2.1, )' - api 'com.braze:android-sdk-ui:39.0.0' + api 'com.braze:android-sdk-ui:[39.0.0,40.0.0)' testImplementation files('libs/java-json.jar') } diff --git a/kits/braze/braze-40/build.gradle b/kits/braze/braze-40/build.gradle index 34f48dba3..bd812eb14 100644 --- a/kits/braze/braze-40/build.gradle +++ b/kits/braze/braze-40/build.gradle @@ -67,6 +67,6 @@ repositories { dependencies { compileOnly 'com.google.firebase:firebase-messaging:[10.2.1, )' - api 'com.braze:android-sdk-ui:40.0.0' + api 'com.braze:android-sdk-ui:[40.0.0,41.0.0)' testImplementation files('libs/java-json.jar') } diff --git a/kits/braze/braze-41/build.gradle b/kits/braze/braze-41/build.gradle index a185d6d9c..0196456e6 100644 --- a/kits/braze/braze-41/build.gradle +++ b/kits/braze/braze-41/build.gradle @@ -67,6 +67,6 @@ repositories { dependencies { compileOnly 'com.google.firebase:firebase-messaging:[10.2.1, )' - api 'com.braze:android-sdk-ui:41.0.0' + api 'com.braze:android-sdk-ui:[41.0.0,41.1.0)' testImplementation files('libs/java-json.jar') } diff --git a/kits/clevertap/clevertap-7/build.gradle b/kits/clevertap/clevertap-7/build.gradle index 17577a54c..d5ebf5f5b 100644 --- a/kits/clevertap/clevertap-7/build.gradle +++ b/kits/clevertap/clevertap-7/build.gradle @@ -57,5 +57,5 @@ android { dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' - api 'com.clevertap.android:clevertap-android-sdk:7.5.0' + api 'com.clevertap.android:clevertap-android-sdk:[7.5.0,8.0.0)' } diff --git a/kits/comscore/comscore-6/build.gradle b/kits/comscore/comscore-6/build.gradle index 9b8b6142f..232d6e8b9 100644 --- a/kits/comscore/comscore-6/build.gradle +++ b/kits/comscore/comscore-6/build.gradle @@ -57,5 +57,5 @@ android { } dependencies { - api 'com.comscore:android-analytics:6.9.2' + api 'com.comscore:android-analytics:[6.9.2,7.0.0)' } diff --git a/kits/ga/ga-23/build.gradle b/kits/ga/ga-23/build.gradle index 898c9a56d..ddf20a5a6 100644 --- a/kits/ga/ga-23/build.gradle +++ b/kits/ga/ga-23/build.gradle @@ -60,6 +60,6 @@ android { dependencies { testImplementation files('libs/java-json.jar') testImplementation files('libs/test-utils.aar') - testImplementation 'com.google.android.gms:play-services-measurement-api:22.1.0' - compileOnly 'com.google.firebase:firebase-analytics:22.1.0' + testImplementation 'com.google.android.gms:play-services-measurement-api:[22.1.0,23.0.0)' + compileOnly 'com.google.firebase:firebase-analytics:[22.1.0,23.0.0)' } diff --git a/kits/ga4/ga4-23/build.gradle b/kits/ga4/ga4-23/build.gradle index 79de88de4..d4aca3ddb 100644 --- a/kits/ga4/ga4-23/build.gradle +++ b/kits/ga4/ga4-23/build.gradle @@ -60,7 +60,7 @@ android { dependencies { testImplementation files('libs/java-json.jar') testImplementation files('libs/test-utils.aar') - testImplementation 'com.google.android.gms:play-services-measurement-api:22.1.0' + testImplementation 'com.google.android.gms:play-services-measurement-api:[22.1.0,23.0.0)' - compileOnly 'com.google.firebase:firebase-analytics:22.1.0' + compileOnly 'com.google.firebase:firebase-analytics:[22.1.0,23.0.0)' } diff --git a/kits/iterable/iterable-3/build.gradle b/kits/iterable/iterable-3/build.gradle index 0b2da8940..91d99541a 100644 --- a/kits/iterable/iterable-3/build.gradle +++ b/kits/iterable/iterable-3/build.gradle @@ -57,5 +57,5 @@ android { } dependencies { - api 'com.iterable:iterableapi:3.5.10' + api 'com.iterable:iterableapi:[3.5.10,4.0.0)' } diff --git a/kits/kochava/kochava-5/build.gradle b/kits/kochava/kochava-5/build.gradle index d7351440d..b74b5ee30 100644 --- a/kits/kochava/kochava-5/build.gradle +++ b/kits/kochava/kochava-5/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - def kochava_tracker_version = "5.4.0" + def kochava_tracker_version = "[5.4.0,6.0.0)" implementation("com.kochava.tracker:tracker:$kochava_tracker_version") // Required implementation("com.kochava.tracker:events:$kochava_tracker_version") // Optional implementation("com.kochava.tracker:engagement:$kochava_tracker_version") // Optional diff --git a/kits/leanplum/leanplum-7/build.gradle b/kits/leanplum/leanplum-7/build.gradle index 23e6b6e70..680cc492d 100644 --- a/kits/leanplum/leanplum-7/build.gradle +++ b/kits/leanplum/leanplum-7/build.gradle @@ -63,5 +63,5 @@ repositories { dependencies { testImplementation 'org.mockito:mockito-core:5.1.1' - api 'com.leanplum:leanplum-fcm:7.0.1' + api 'com.leanplum:leanplum-fcm:[7.0.1,7.1.0)' } diff --git a/kits/localytics/localytics-6/build.gradle b/kits/localytics/localytics-6/build.gradle index 8a7ed6272..9df344f54 100644 --- a/kits/localytics/localytics-6/build.gradle +++ b/kits/localytics/localytics-6/build.gradle @@ -63,7 +63,7 @@ repositories { } dependencies { - api 'com.localytics.androidx:library:6.3.7' + api 'com.localytics.androidx:library:[6.3.7,7.0.0)' compileOnly 'androidx.appcompat:appcompat:1.6.1' testImplementation files('libs/java-json.jar') } diff --git a/kits/onetrust/onetrust/build.gradle b/kits/onetrust/onetrust/build.gradle index 20ef431bc..05ca9e97d 100644 --- a/kits/onetrust/onetrust/build.gradle +++ b/kits/onetrust/onetrust/build.gradle @@ -59,7 +59,7 @@ android { dependencies { testImplementation fileTree(dir: 'libs', include: ['*.jar']) //note that compileOnly requires kit users to define the dependency themselves - compileOnly 'com.onetrust.cmp:native-sdk:202411.2.0.0' + compileOnly 'com.onetrust.cmp:native-sdk:[202411.2.0.0,202412.0.0.0)' // Add as testImplementation so tests can load OneTrustKit class - testImplementation 'com.onetrust.cmp:native-sdk:202411.2.0.0' + testImplementation 'com.onetrust.cmp:native-sdk:[202411.2.0.0,202412.0.0.0)' } diff --git a/kits/optimizely/optimizely-3/build.gradle b/kits/optimizely/optimizely-3/build.gradle index dbafdc0c8..50f45da10 100644 --- a/kits/optimizely/optimizely-3/build.gradle +++ b/kits/optimizely/optimizely-3/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - api 'com.optimizely.ab:android-sdk:3.13.3' + api 'com.optimizely.ab:android-sdk:[3.13.3,4.0.0)' testImplementation files('libs/java-json.jar') testImplementation files('libs/test-utils.aar') } diff --git a/kits/radar/radar-3/build.gradle b/kits/radar/radar-3/build.gradle index c770839cf..c309bab0b 100644 --- a/kits/radar/radar-3/build.gradle +++ b/kits/radar/radar-3/build.gradle @@ -72,7 +72,6 @@ android { } dependencies { - api 'io.radar:sdk:3.5.11' + api 'io.radar:sdk:[3.5.11,3.6.0)' testImplementation 'org.json:json:20220924' } - diff --git a/kits/rokt/rokt/build.gradle b/kits/rokt/rokt/build.gradle index cc343d190..5fa6ccc96 100644 --- a/kits/rokt/rokt/build.gradle +++ b/kits/rokt/rokt/build.gradle @@ -82,7 +82,7 @@ dependencies { implementation 'androidx.annotation:annotation:1.5.0' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0' implementation 'androidx.compose.runtime:runtime' - api 'com.rokt:roktsdk:6.0.1-rc.1' + api 'com.rokt:roktsdk:[6.0.1-rc.1,7.0.0)' api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" testImplementation files('libs/java-json.jar') diff --git a/kits/singular/singular-12/build.gradle b/kits/singular/singular-12/build.gradle index d9431f556..b75b7ac42 100644 --- a/kits/singular/singular-12/build.gradle +++ b/kits/singular/singular-12/build.gradle @@ -64,7 +64,7 @@ android { } dependencies { - api 'com.singular.sdk:singular_sdk:12.5.4' + api 'com.singular.sdk:singular_sdk:[12.5.4,13.0.0)' androidTestImplementation 'androidx.test:runner:1.5.2' testImplementation 'org.powermock:powermock-core:2.0.9' diff --git a/kits/urbanairship/urbanairship-20/build.gradle b/kits/urbanairship/urbanairship-20/build.gradle index f1732b0dd..89ed818b8 100644 --- a/kits/urbanairship/urbanairship-20/build.gradle +++ b/kits/urbanairship/urbanairship-20/build.gradle @@ -59,7 +59,7 @@ android { dependencies { compileOnly 'androidx.legacy:legacy-support-v4:1.0.0' - api 'com.urbanairship.android:urbanairship-core:20.3.0' + api 'com.urbanairship.android:urbanairship-core:[20.3.0,21.0.0)' testImplementation 'junit:junit:4.13.2' testImplementation files('libs/java-json.jar') } From 02694bdcfab29d2409ee36518536d5136677f897 Mon Sep 17 00:00:00 2001 From: Nickolas Dimitrakas Date: Wed, 24 Jun 2026 16:30:32 -0400 Subject: [PATCH 2/3] refactor(adobemedia): rename kit to adobemedia-3 and lock to Adobe SDK BOM Adobe's Experience Platform SDK is at major 3.x, so the kit directory now follows the wrapped-SDK-major convention (adobemedia-5 -> adobemedia-3). Replace the mixed per-artifact pins with the Adobe sdk-bom. The legacy sdk-core (deprecated 2024-06-30) and mobileservices (unsupported on Android) artifacts are dropped; modern `core` now arrives via the BOM. The BOM range [3.0.0,4.0.0) auto-tracks the latest 3.x minor/patch, the Gradle equivalent of iOS SPM .upToNextMajor(from: "3.0.0"). Updated matrix.json, settings-kits.gradle, settings-kit-examples.gradle, the example module project ref, and the README install line. Co-Authored-By: Claude Opus 4.8 --- .../{adobemedia-5 => adobemedia-3}/README.md | 2 +- .../build.gradle | 23 ++++++++++++------ .../consumer-proguard.pro | 0 .../example/example-kotlin/build.gradle | 2 +- .../src/main/AndroidManifest.xml | 0 .../example/kotlin/ExampleApplication.kt | 0 .../adobemedia/example/kotlin/MainActivity.kt | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../{adobemedia-5 => adobemedia-3}/gradlew | 0 .../gradlew.bat | 0 .../libs/java-json.jar | Bin .../settings.gradle.kts | 0 .../src/main/AndroidManifest.xml | 0 .../kotlin/com/mparticle/kits/AdobeApi.kt | 0 .../kotlin/com/mparticle/kits/AdobeKit.kt | 0 .../com/adobe/marketing/mobile/MobileCore.kt | 0 .../com/mparticle/kits/AdobeMediaKitTests.kt | 0 kits/matrix.json | 8 +++--- settings-kit-examples.gradle | 4 +-- settings-kits.gradle | 2 +- 28 files changed, 24 insertions(+), 17 deletions(-) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/README.md (94%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/build.gradle (74%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/consumer-proguard.pro (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/build.gradle (92%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/AndroidManifest.xml (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/ExampleApplication.kt (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/MainActivity.kt (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/res/layout/activity_main.xml (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/res/values/colors.xml (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/example/example-kotlin/src/main/res/values/strings.xml (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/gradle.properties (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/gradle/wrapper/gradle-wrapper.jar (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/gradle/wrapper/gradle-wrapper.properties (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/gradlew (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/gradlew.bat (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/libs/java-json.jar (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/settings.gradle.kts (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/src/main/AndroidManifest.xml (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/src/main/kotlin/com/mparticle/kits/AdobeApi.kt (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/src/main/kotlin/com/mparticle/kits/AdobeKit.kt (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/src/test/kotlin/com/adobe/marketing/mobile/MobileCore.kt (100%) rename kits/adobemedia/{adobemedia-5 => adobemedia-3}/src/test/kotlin/com/mparticle/kits/AdobeMediaKitTests.kt (100%) diff --git a/kits/adobemedia/adobemedia-5/README.md b/kits/adobemedia/adobemedia-3/README.md similarity index 94% rename from kits/adobemedia/adobemedia-5/README.md rename to kits/adobemedia/adobemedia-3/README.md index 74a3c96da..b79a29f2e 100644 --- a/kits/adobemedia/adobemedia-5/README.md +++ b/kits/adobemedia/adobemedia-3/README.md @@ -10,7 +10,7 @@ Please note that the `adobemedia-kit` contains all the functionality of the `ado ```groovy dependencies { - implementation 'com.mparticle:android-adobemedia-kit:5+' + implementation 'com.mparticle:android-adobemedia-kit:3+' } ``` diff --git a/kits/adobemedia/adobemedia-5/build.gradle b/kits/adobemedia/adobemedia-3/build.gradle similarity index 74% rename from kits/adobemedia/adobemedia-5/build.gradle rename to kits/adobemedia/adobemedia-3/build.gradle index d8de13401..76d6463c6 100644 --- a/kits/adobemedia/adobemedia-5/build.gradle +++ b/kits/adobemedia/adobemedia-3/build.gradle @@ -85,12 +85,19 @@ configurations.all { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api 'com.mparticle:android-media:1.5.0' - api 'com.adobe.marketing.mobile:mobileservices:[1.1.5,2.0.0)' - api 'com.adobe.marketing.mobile:analytics:[3.0.1,4.0.0)' - api 'com.adobe.marketing.mobile:media:[3.1.0,4.0.0)' - api 'com.adobe.marketing.mobile:userprofile:[3.0.0,4.0.0)' - api 'com.adobe.marketing.mobile:lifecycle:[3.0.0,4.0.0)' - api 'com.adobe.marketing.mobile:identity:[3.0.0,4.0.0)' - api 'com.adobe.marketing.mobile:signal:[3.0.0,4.0.0)' - api 'com.adobe.marketing.mobile:sdk-core:[1.11.7,2.0.0)' + + // Adobe Experience Platform Mobile SDK. + // The BOM (Bill of Materials) pins every Adobe extension to a single + // mutually-compatible version set. The range on the BOM coordinate tracks + // the latest 3.x release automatically (newest minor + patch within the + // major) — the Gradle equivalent of iOS SPM .upToNextMajor(from: "3.0.0"). + // Individual extensions are declared without versions; the BOM supplies them. + api platform('com.adobe.marketing.mobile:sdk-bom:[3.0.0,4.0.0)') + api 'com.adobe.marketing.mobile:core' + api 'com.adobe.marketing.mobile:analytics' + api 'com.adobe.marketing.mobile:media' + api 'com.adobe.marketing.mobile:userprofile' + api 'com.adobe.marketing.mobile:lifecycle' + api 'com.adobe.marketing.mobile:identity' + api 'com.adobe.marketing.mobile:signal' } diff --git a/kits/adobemedia/adobemedia-5/consumer-proguard.pro b/kits/adobemedia/adobemedia-3/consumer-proguard.pro similarity index 100% rename from kits/adobemedia/adobemedia-5/consumer-proguard.pro rename to kits/adobemedia/adobemedia-3/consumer-proguard.pro diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/build.gradle b/kits/adobemedia/adobemedia-3/example/example-kotlin/build.gradle similarity index 92% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/build.gradle rename to kits/adobemedia/adobemedia-3/example/example-kotlin/build.gradle index 01f8a6208..410dfe526 100644 --- a/kits/adobemedia/adobemedia-5/example/example-kotlin/build.gradle +++ b/kits/adobemedia/adobemedia-3/example/example-kotlin/build.gradle @@ -32,7 +32,7 @@ android { } dependencies { - implementation project(':kits:adobemedia:adobemedia-5') + implementation project(':kits:adobemedia:adobemedia-3') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.11.0' } diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/AndroidManifest.xml b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/AndroidManifest.xml similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/AndroidManifest.xml rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/AndroidManifest.xml diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/ExampleApplication.kt b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/ExampleApplication.kt similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/ExampleApplication.kt rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/ExampleApplication.kt diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/MainActivity.kt b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/MainActivity.kt similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/MainActivity.kt rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobemedia/example/kotlin/MainActivity.kt diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/layout/activity_main.xml b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/layout/activity_main.xml similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/layout/activity_main.xml rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/layout/activity_main.xml diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/values/colors.xml b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/values/colors.xml similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/values/colors.xml rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/values/colors.xml diff --git a/kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/values/strings.xml b/kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/values/strings.xml similarity index 100% rename from kits/adobemedia/adobemedia-5/example/example-kotlin/src/main/res/values/strings.xml rename to kits/adobemedia/adobemedia-3/example/example-kotlin/src/main/res/values/strings.xml diff --git a/kits/adobemedia/adobemedia-5/gradle.properties b/kits/adobemedia/adobemedia-3/gradle.properties similarity index 100% rename from kits/adobemedia/adobemedia-5/gradle.properties rename to kits/adobemedia/adobemedia-3/gradle.properties diff --git a/kits/adobemedia/adobemedia-5/gradle/wrapper/gradle-wrapper.jar b/kits/adobemedia/adobemedia-3/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from kits/adobemedia/adobemedia-5/gradle/wrapper/gradle-wrapper.jar rename to kits/adobemedia/adobemedia-3/gradle/wrapper/gradle-wrapper.jar diff --git a/kits/adobemedia/adobemedia-5/gradle/wrapper/gradle-wrapper.properties b/kits/adobemedia/adobemedia-3/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from kits/adobemedia/adobemedia-5/gradle/wrapper/gradle-wrapper.properties rename to kits/adobemedia/adobemedia-3/gradle/wrapper/gradle-wrapper.properties diff --git a/kits/adobemedia/adobemedia-5/gradlew b/kits/adobemedia/adobemedia-3/gradlew similarity index 100% rename from kits/adobemedia/adobemedia-5/gradlew rename to kits/adobemedia/adobemedia-3/gradlew diff --git a/kits/adobemedia/adobemedia-5/gradlew.bat b/kits/adobemedia/adobemedia-3/gradlew.bat similarity index 100% rename from kits/adobemedia/adobemedia-5/gradlew.bat rename to kits/adobemedia/adobemedia-3/gradlew.bat diff --git a/kits/adobemedia/adobemedia-5/libs/java-json.jar b/kits/adobemedia/adobemedia-3/libs/java-json.jar similarity index 100% rename from kits/adobemedia/adobemedia-5/libs/java-json.jar rename to kits/adobemedia/adobemedia-3/libs/java-json.jar diff --git a/kits/adobemedia/adobemedia-5/settings.gradle.kts b/kits/adobemedia/adobemedia-3/settings.gradle.kts similarity index 100% rename from kits/adobemedia/adobemedia-5/settings.gradle.kts rename to kits/adobemedia/adobemedia-3/settings.gradle.kts diff --git a/kits/adobemedia/adobemedia-5/src/main/AndroidManifest.xml b/kits/adobemedia/adobemedia-3/src/main/AndroidManifest.xml similarity index 100% rename from kits/adobemedia/adobemedia-5/src/main/AndroidManifest.xml rename to kits/adobemedia/adobemedia-3/src/main/AndroidManifest.xml diff --git a/kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeApi.kt b/kits/adobemedia/adobemedia-3/src/main/kotlin/com/mparticle/kits/AdobeApi.kt similarity index 100% rename from kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeApi.kt rename to kits/adobemedia/adobemedia-3/src/main/kotlin/com/mparticle/kits/AdobeApi.kt diff --git a/kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt b/kits/adobemedia/adobemedia-3/src/main/kotlin/com/mparticle/kits/AdobeKit.kt similarity index 100% rename from kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt rename to kits/adobemedia/adobemedia-3/src/main/kotlin/com/mparticle/kits/AdobeKit.kt diff --git a/kits/adobemedia/adobemedia-5/src/test/kotlin/com/adobe/marketing/mobile/MobileCore.kt b/kits/adobemedia/adobemedia-3/src/test/kotlin/com/adobe/marketing/mobile/MobileCore.kt similarity index 100% rename from kits/adobemedia/adobemedia-5/src/test/kotlin/com/adobe/marketing/mobile/MobileCore.kt rename to kits/adobemedia/adobemedia-3/src/test/kotlin/com/adobe/marketing/mobile/MobileCore.kt diff --git a/kits/adobemedia/adobemedia-5/src/test/kotlin/com/mparticle/kits/AdobeMediaKitTests.kt b/kits/adobemedia/adobemedia-3/src/test/kotlin/com/mparticle/kits/AdobeMediaKitTests.kt similarity index 100% rename from kits/adobemedia/adobemedia-5/src/test/kotlin/com/mparticle/kits/AdobeMediaKitTests.kt rename to kits/adobemedia/adobemedia-3/src/test/kotlin/com/mparticle/kits/AdobeMediaKitTests.kt diff --git a/kits/matrix.json b/kits/matrix.json index e9138dc95..7f646b408 100644 --- a/kits/matrix.json +++ b/kits/matrix.json @@ -12,10 +12,10 @@ "example_kotlin_project": ":kits:android-adobe:adobe-5:example-kotlin" }, { - "name": "adobemedia-5", - "local_path": "kits/adobemedia/adobemedia-5", - "kit_project": ":kits:android-adobemedia:adobemedia-5", - "example_kotlin_project": ":kits:android-adobemedia:adobemedia-5:example-kotlin" + "name": "adobemedia-3", + "local_path": "kits/adobemedia/adobemedia-3", + "kit_project": ":kits:android-adobemedia:adobemedia-3", + "example_kotlin_project": ":kits:android-adobemedia:adobemedia-3:example-kotlin" }, { "name": "appsflyer-6", diff --git a/settings-kit-examples.gradle b/settings-kit-examples.gradle index 0c54c4d80..6f1f79ace 100644 --- a/settings-kit-examples.gradle +++ b/settings-kit-examples.gradle @@ -3,7 +3,7 @@ apply from: 'settings-kits.gradle' include ':kits:adjust:adjust-5:example-kotlin', ':kits:adobe:adobe-5:example-kotlin', - ':kits:adobemedia:adobemedia-5:example-kotlin', + ':kits:adobemedia:adobemedia-3:example-kotlin', ':kits:appsflyer:appsflyer-6:example-kotlin', ':kits:apptentive:apptentive-6:example-kotlin', ':kits:apptimize:apptimize-3:example-kotlin', @@ -28,7 +28,7 @@ include ':kits:adjust:adjust-5:example-kotlin', project(':kits:adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin') project(':kits:adobe:adobe-5:example-kotlin').projectDir = file('kits/adobe/adobe-5/example/example-kotlin') -project(':kits:adobemedia:adobemedia-5:example-kotlin').projectDir = file('kits/adobemedia/adobemedia-5/example/example-kotlin') +project(':kits:adobemedia:adobemedia-3:example-kotlin').projectDir = file('kits/adobemedia/adobemedia-3/example/example-kotlin') project(':kits:appsflyer:appsflyer-6:example-kotlin').projectDir = file('kits/appsflyer/appsflyer-6/example/example-kotlin') project(':kits:apptentive:apptentive-6:example-kotlin').projectDir = file('kits/apptentive/apptentive-6/example/example-kotlin') project(':kits:apptimize:apptimize-3:example-kotlin').projectDir = file('kits/apptimize/apptimize-3/example/example-kotlin') diff --git a/settings-kits.gradle b/settings-kits.gradle index 274572951..3f96b0693 100644 --- a/settings-kits.gradle +++ b/settings-kits.gradle @@ -3,7 +3,7 @@ include ( ':kits:adjust:adjust-5', ':kits:adobe:adobe-5', - ':kits:adobemedia:adobemedia-5', + ':kits:adobemedia:adobemedia-3', ':kits:appsflyer:appsflyer-6', ':kits:apptentive:apptentive-6', ':kits:apptimize:apptimize-3', From 3726f3ef242f288c7d7f03c28344462d9d97a073 Mon Sep 17 00:00:00 2001 From: Nickolas Dimitrakas Date: Wed, 24 Jun 2026 17:01:14 -0400 Subject: [PATCH 3/3] refactor(adobe): rename adobe-5 to adobe (no SDK, S2S only) and drop adobemedia BOM comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The adobe kit is a server-to-server integration with no Adobe SDK dependency (no com.adobe.* imports), so the wrapped-SDK-major suffix does not apply — renamed adobe-5 -> adobe, matching the no-number convention used by onetrust and rokt. Updated matrix.json, settings-kits.gradle, settings-kit-examples.gradle, and the example module project ref. The published artifact version (android-adobe-kit:5+) is unchanged, consistent with other no-number kits. Also removed the explanatory comments from the adobemedia-3 BOM block. Co-Authored-By: Claude Opus 4.8 --- kits/adobe/{adobe-5 => adobe}/README.md | 0 kits/adobe/{adobe-5 => adobe}/build.gradle | 0 kits/adobe/{adobe-5 => adobe}/consumer-proguard.pro | 0 .../example/example-kotlin/build.gradle | 2 +- .../example-kotlin/src/main/AndroidManifest.xml | 0 .../kits/adobe/example/kotlin/ExampleApplication.kt | 0 .../kits/adobe/example/kotlin/MainActivity.kt | 0 .../main/res/drawable/ic_launcher_foreground.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../example-kotlin/src/main/res/values/colors.xml | 0 .../example-kotlin/src/main/res/values/strings.xml | 0 kits/adobe/{adobe-5 => adobe}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 kits/adobe/{adobe-5 => adobe}/gradlew | 0 kits/adobe/{adobe-5 => adobe}/gradlew.bat | 0 kits/adobe/{adobe-5 => adobe}/settings.gradle.kts | 0 .../{adobe-5 => adobe}/src/main/AndroidManifest.xml | 0 .../src/main/kotlin/com/mparticle/kits/AdobeApi.kt | 0 .../src/main/kotlin/com/mparticle/kits/AdobeKit.kt | 0 .../main/kotlin/com/mparticle/kits/AdobeKitBase.kt | 0 .../src/main/res/values/strings.xml | 0 .../test/kotlin/com/mparticle/kits/AdobeKitTest.kt | 0 kits/adobemedia/adobemedia-3/build.gradle | 7 ------- kits/matrix.json | 8 ++++---- settings-kit-examples.gradle | 4 ++-- settings-kits.gradle | 2 +- 29 files changed, 8 insertions(+), 15 deletions(-) rename kits/adobe/{adobe-5 => adobe}/README.md (100%) rename kits/adobe/{adobe-5 => adobe}/build.gradle (100%) rename kits/adobe/{adobe-5 => adobe}/consumer-proguard.pro (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/build.gradle (94%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/AndroidManifest.xml (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/ExampleApplication.kt (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/MainActivity.kt (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/res/layout/activity_main.xml (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/res/values/colors.xml (100%) rename kits/adobe/{adobe-5 => adobe}/example/example-kotlin/src/main/res/values/strings.xml (100%) rename kits/adobe/{adobe-5 => adobe}/gradle.properties (100%) rename kits/adobe/{adobe-5 => adobe}/gradle/wrapper/gradle-wrapper.jar (100%) rename kits/adobe/{adobe-5 => adobe}/gradle/wrapper/gradle-wrapper.properties (100%) rename kits/adobe/{adobe-5 => adobe}/gradlew (100%) rename kits/adobe/{adobe-5 => adobe}/gradlew.bat (100%) rename kits/adobe/{adobe-5 => adobe}/settings.gradle.kts (100%) rename kits/adobe/{adobe-5 => adobe}/src/main/AndroidManifest.xml (100%) rename kits/adobe/{adobe-5 => adobe}/src/main/kotlin/com/mparticle/kits/AdobeApi.kt (100%) rename kits/adobe/{adobe-5 => adobe}/src/main/kotlin/com/mparticle/kits/AdobeKit.kt (100%) rename kits/adobe/{adobe-5 => adobe}/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt (100%) rename kits/adobe/{adobe-5 => adobe}/src/main/res/values/strings.xml (100%) rename kits/adobe/{adobe-5 => adobe}/src/test/kotlin/com/mparticle/kits/AdobeKitTest.kt (100%) diff --git a/kits/adobe/adobe-5/README.md b/kits/adobe/adobe/README.md similarity index 100% rename from kits/adobe/adobe-5/README.md rename to kits/adobe/adobe/README.md diff --git a/kits/adobe/adobe-5/build.gradle b/kits/adobe/adobe/build.gradle similarity index 100% rename from kits/adobe/adobe-5/build.gradle rename to kits/adobe/adobe/build.gradle diff --git a/kits/adobe/adobe-5/consumer-proguard.pro b/kits/adobe/adobe/consumer-proguard.pro similarity index 100% rename from kits/adobe/adobe-5/consumer-proguard.pro rename to kits/adobe/adobe/consumer-proguard.pro diff --git a/kits/adobe/adobe-5/example/example-kotlin/build.gradle b/kits/adobe/adobe/example/example-kotlin/build.gradle similarity index 94% rename from kits/adobe/adobe-5/example/example-kotlin/build.gradle rename to kits/adobe/adobe/example/example-kotlin/build.gradle index ee684f397..74f4dbaa0 100644 --- a/kits/adobe/adobe-5/example/example-kotlin/build.gradle +++ b/kits/adobe/adobe/example/example-kotlin/build.gradle @@ -33,7 +33,7 @@ android { } dependencies { - implementation project(':kits:adobe:adobe-5') + implementation project(':kits:adobe:adobe') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.multidex:multidex:2.0.1' diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/AndroidManifest.xml b/kits/adobe/adobe/example/example-kotlin/src/main/AndroidManifest.xml similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/AndroidManifest.xml rename to kits/adobe/adobe/example/example-kotlin/src/main/AndroidManifest.xml diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/ExampleApplication.kt b/kits/adobe/adobe/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/ExampleApplication.kt similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/ExampleApplication.kt rename to kits/adobe/adobe/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/ExampleApplication.kt diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/MainActivity.kt b/kits/adobe/adobe/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/MainActivity.kt similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/MainActivity.kt rename to kits/adobe/adobe/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adobe/example/kotlin/MainActivity.kt diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml b/kits/adobe/adobe/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml rename to kits/adobe/adobe/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/res/layout/activity_main.xml b/kits/adobe/adobe/example/example-kotlin/src/main/res/layout/activity_main.xml similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/res/layout/activity_main.xml rename to kits/adobe/adobe/example/example-kotlin/src/main/res/layout/activity_main.xml diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/kits/adobe/adobe/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to kits/adobe/adobe/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/kits/adobe/adobe/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to kits/adobe/adobe/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/res/values/colors.xml b/kits/adobe/adobe/example/example-kotlin/src/main/res/values/colors.xml similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/res/values/colors.xml rename to kits/adobe/adobe/example/example-kotlin/src/main/res/values/colors.xml diff --git a/kits/adobe/adobe-5/example/example-kotlin/src/main/res/values/strings.xml b/kits/adobe/adobe/example/example-kotlin/src/main/res/values/strings.xml similarity index 100% rename from kits/adobe/adobe-5/example/example-kotlin/src/main/res/values/strings.xml rename to kits/adobe/adobe/example/example-kotlin/src/main/res/values/strings.xml diff --git a/kits/adobe/adobe-5/gradle.properties b/kits/adobe/adobe/gradle.properties similarity index 100% rename from kits/adobe/adobe-5/gradle.properties rename to kits/adobe/adobe/gradle.properties diff --git a/kits/adobe/adobe-5/gradle/wrapper/gradle-wrapper.jar b/kits/adobe/adobe/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from kits/adobe/adobe-5/gradle/wrapper/gradle-wrapper.jar rename to kits/adobe/adobe/gradle/wrapper/gradle-wrapper.jar diff --git a/kits/adobe/adobe-5/gradle/wrapper/gradle-wrapper.properties b/kits/adobe/adobe/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from kits/adobe/adobe-5/gradle/wrapper/gradle-wrapper.properties rename to kits/adobe/adobe/gradle/wrapper/gradle-wrapper.properties diff --git a/kits/adobe/adobe-5/gradlew b/kits/adobe/adobe/gradlew similarity index 100% rename from kits/adobe/adobe-5/gradlew rename to kits/adobe/adobe/gradlew diff --git a/kits/adobe/adobe-5/gradlew.bat b/kits/adobe/adobe/gradlew.bat similarity index 100% rename from kits/adobe/adobe-5/gradlew.bat rename to kits/adobe/adobe/gradlew.bat diff --git a/kits/adobe/adobe-5/settings.gradle.kts b/kits/adobe/adobe/settings.gradle.kts similarity index 100% rename from kits/adobe/adobe-5/settings.gradle.kts rename to kits/adobe/adobe/settings.gradle.kts diff --git a/kits/adobe/adobe-5/src/main/AndroidManifest.xml b/kits/adobe/adobe/src/main/AndroidManifest.xml similarity index 100% rename from kits/adobe/adobe-5/src/main/AndroidManifest.xml rename to kits/adobe/adobe/src/main/AndroidManifest.xml diff --git a/kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeApi.kt b/kits/adobe/adobe/src/main/kotlin/com/mparticle/kits/AdobeApi.kt similarity index 100% rename from kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeApi.kt rename to kits/adobe/adobe/src/main/kotlin/com/mparticle/kits/AdobeApi.kt diff --git a/kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt b/kits/adobe/adobe/src/main/kotlin/com/mparticle/kits/AdobeKit.kt similarity index 100% rename from kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt rename to kits/adobe/adobe/src/main/kotlin/com/mparticle/kits/AdobeKit.kt diff --git a/kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt b/kits/adobe/adobe/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt similarity index 100% rename from kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt rename to kits/adobe/adobe/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt diff --git a/kits/adobe/adobe-5/src/main/res/values/strings.xml b/kits/adobe/adobe/src/main/res/values/strings.xml similarity index 100% rename from kits/adobe/adobe-5/src/main/res/values/strings.xml rename to kits/adobe/adobe/src/main/res/values/strings.xml diff --git a/kits/adobe/adobe-5/src/test/kotlin/com/mparticle/kits/AdobeKitTest.kt b/kits/adobe/adobe/src/test/kotlin/com/mparticle/kits/AdobeKitTest.kt similarity index 100% rename from kits/adobe/adobe-5/src/test/kotlin/com/mparticle/kits/AdobeKitTest.kt rename to kits/adobe/adobe/src/test/kotlin/com/mparticle/kits/AdobeKitTest.kt diff --git a/kits/adobemedia/adobemedia-3/build.gradle b/kits/adobemedia/adobemedia-3/build.gradle index 76d6463c6..9ad37c2aa 100644 --- a/kits/adobemedia/adobemedia-3/build.gradle +++ b/kits/adobemedia/adobemedia-3/build.gradle @@ -85,13 +85,6 @@ configurations.all { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api 'com.mparticle:android-media:1.5.0' - - // Adobe Experience Platform Mobile SDK. - // The BOM (Bill of Materials) pins every Adobe extension to a single - // mutually-compatible version set. The range on the BOM coordinate tracks - // the latest 3.x release automatically (newest minor + patch within the - // major) — the Gradle equivalent of iOS SPM .upToNextMajor(from: "3.0.0"). - // Individual extensions are declared without versions; the BOM supplies them. api platform('com.adobe.marketing.mobile:sdk-bom:[3.0.0,4.0.0)') api 'com.adobe.marketing.mobile:core' api 'com.adobe.marketing.mobile:analytics' diff --git a/kits/matrix.json b/kits/matrix.json index 7f646b408..9e099fdfc 100644 --- a/kits/matrix.json +++ b/kits/matrix.json @@ -6,10 +6,10 @@ "example_kotlin_project": ":kits:android-adjust:adjust-5:example-kotlin" }, { - "name": "adobe-5", - "local_path": "kits/adobe/adobe-5", - "kit_project": ":kits:android-adobe:adobe-5", - "example_kotlin_project": ":kits:android-adobe:adobe-5:example-kotlin" + "name": "adobe", + "local_path": "kits/adobe/adobe", + "kit_project": ":kits:android-adobe:adobe", + "example_kotlin_project": ":kits:android-adobe:adobe:example-kotlin" }, { "name": "adobemedia-3", diff --git a/settings-kit-examples.gradle b/settings-kit-examples.gradle index 6f1f79ace..4693ab0df 100644 --- a/settings-kit-examples.gradle +++ b/settings-kit-examples.gradle @@ -2,7 +2,7 @@ apply from: 'settings-kits.gradle' include ':kits:adjust:adjust-5:example-kotlin', - ':kits:adobe:adobe-5:example-kotlin', + ':kits:adobe:adobe:example-kotlin', ':kits:adobemedia:adobemedia-3:example-kotlin', ':kits:appsflyer:appsflyer-6:example-kotlin', ':kits:apptentive:apptentive-6:example-kotlin', @@ -27,7 +27,7 @@ include ':kits:adjust:adjust-5:example-kotlin', ':kits:singular:singular-12:example-kotlin' project(':kits:adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin') -project(':kits:adobe:adobe-5:example-kotlin').projectDir = file('kits/adobe/adobe-5/example/example-kotlin') +project(':kits:adobe:adobe:example-kotlin').projectDir = file('kits/adobe/adobe/example/example-kotlin') project(':kits:adobemedia:adobemedia-3:example-kotlin').projectDir = file('kits/adobemedia/adobemedia-3/example/example-kotlin') project(':kits:appsflyer:appsflyer-6:example-kotlin').projectDir = file('kits/appsflyer/appsflyer-6/example/example-kotlin') project(':kits:apptentive:apptentive-6:example-kotlin').projectDir = file('kits/apptentive/apptentive-6/example/example-kotlin') diff --git a/settings-kits.gradle b/settings-kits.gradle index 3f96b0693..8743b660e 100644 --- a/settings-kits.gradle +++ b/settings-kits.gradle @@ -2,7 +2,7 @@ include ( ':kits:adjust:adjust-5', - ':kits:adobe:adobe-5', + ':kits:adobe:adobe', ':kits:adobemedia:adobemedia-3', ':kits:appsflyer:appsflyer-6', ':kits:apptentive:apptentive-6',