From be98daf820dcedb06fe92bb70ec1e3106f0a9543 Mon Sep 17 00:00:00 2001 From: Navratan Soni Date: Sat, 9 May 2026 15:55:01 +0530 Subject: [PATCH 1/5] Upgraded to latest gradle plugin, changed to locally target aepd-sdk-gradle plugin --- code/build.gradle.kts | 2 +- code/settings.gradle.kts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/build.gradle.kts b/code/build.gradle.kts index 17402fe20..d2047400b 100644 --- a/code/build.gradle.kts +++ b/code/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath("com.github.adobe:aepsdk-commons:gp-3.4.1") + classpath("com.github.adobe.aepsdk-commons:aepsdk-gradle-plugin:3.4.3") classpath("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2") classpath("androidx.benchmark:benchmark-gradle-plugin:1.2.3") } diff --git a/code/settings.gradle.kts b/code/settings.gradle.kts index 09345d8b3..65c8f1366 100644 --- a/code/settings.gradle.kts +++ b/code/settings.gradle.kts @@ -7,6 +7,13 @@ pluginManagement { } } +includeBuild("../../aepsdk-commons/android/aepsdk-gradle-plugin") { + dependencySubstitution { + substitute(module("com.github.adobe.aepsdk-commons:aepsdk-gradle-plugin")) + .using(project(":aepsdk-gradle-plugin")) + } +} + dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { From f73332d4673d42f7f5255a36b1d3043ef0065dca Mon Sep 17 00:00:00 2001 From: Navratan Soni Date: Sun, 10 May 2026 18:03:45 +0530 Subject: [PATCH 2/5] Migrated testapp Compose to Kotlin 2.0 plugin model - Added id("org.jetbrains.kotlin.plugin.compose") to the plugins block. - Removed the composeOptions.kotlinCompilerExtensionVersion configuration, which is the deprecated AGP mechanism replaced by the dedicated Kotlin Compose Gradle plugin in Kotlin 2.0+. Mirror of the commons change in AEPLibraryPlugin.configureCompose(); testapp applies plugins directly (com.android.application) rather than via aep-library, so it needs the equivalent migration in its own build file. Required because BuildConstants.Versions.COMPOSE_COMPILER no longer exists in commons. --- code/testapp/build.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/testapp/build.gradle.kts b/code/testapp/build.gradle.kts index c183b4660..14bbf9570 100644 --- a/code/testapp/build.gradle.kts +++ b/code/testapp/build.gradle.kts @@ -2,6 +2,7 @@ import com.adobe.marketing.mobile.gradle.BuildConstants plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") } android { @@ -40,9 +41,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = BuildConstants.Versions.COMPOSE_COMPILER - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" From 47218f59a243b52bf0f251890be0f1ef7675bb98 Mon Sep 17 00:00:00 2001 From: Navratan Soni Date: Sun, 10 May 2026 22:54:03 +0530 Subject: [PATCH 3/5] Bumped Gradle wrapper to 8.11.1 Required by AGP 8.9.x (the new commons minimum). AGP versions 8.9.0+ require Gradle 8.11.1 or higher per official compatibility docs. Mirror of the commons-side wrapper bump in aepsdk-commons commit cd9e8dc. --- code/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/gradle/wrapper/gradle-wrapper.properties b/code/gradle/wrapper/gradle-wrapper.properties index b93c46a5f..11581996b 100644 --- a/code/gradle/wrapper/gradle-wrapper.properties +++ b/code/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 39e5355aa119663ffc65a8cfc10c1dc4f9c3a6b4 Mon Sep 17 00:00:00 2001 From: Navratan Soni Date: Tue, 12 May 2026 16:31:51 +0530 Subject: [PATCH 4/5] Removed local composite-build wiring for aepsdk-commons; bumped gradle plugin classpath to 4.0.0 Composite build via includeBuild("../../aepsdk-commons/...") was a local-dev convenience for iterating on commons + core in lockstep. Removed before pushing api_36_upgrade to remote so the branch is production-clean. Plugin classpath now references com.github.adobe.aepsdk-commons:aepsdk-gradle-plugin:4.0.0, which is the version commons will be tagged at for this initiative. Until the tag is published to JitPack, the plugin can be consumed from local Maven via publishToMavenLocal in commons (see the per-SDK upgrade guide). --- code/build.gradle.kts | 2 +- code/settings.gradle.kts | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/build.gradle.kts b/code/build.gradle.kts index d2047400b..db4563838 100644 --- a/code/build.gradle.kts +++ b/code/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath("com.github.adobe.aepsdk-commons:aepsdk-gradle-plugin:3.4.3") + classpath("com.github.adobe.aepsdk-commons:aepsdk-gradle-plugin:4.0.0") classpath("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2") classpath("androidx.benchmark:benchmark-gradle-plugin:1.2.3") } diff --git a/code/settings.gradle.kts b/code/settings.gradle.kts index 65c8f1366..09345d8b3 100644 --- a/code/settings.gradle.kts +++ b/code/settings.gradle.kts @@ -7,13 +7,6 @@ pluginManagement { } } -includeBuild("../../aepsdk-commons/android/aepsdk-gradle-plugin") { - dependencySubstitution { - substitute(module("com.github.adobe.aepsdk-commons:aepsdk-gradle-plugin")) - .using(project(":aepsdk-gradle-plugin")) - } -} - dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { From ccbcf91367f6039c504e8052acadce89d2c4c952 Mon Sep 17 00:00:00 2001 From: Navratan Soni Date: Tue, 12 May 2026 16:33:20 +0530 Subject: [PATCH 5/5] Bumped module versions to 4.0.0 for API 36 upgrade (major version) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Major version bump (3.x.y -> 4.0.0) reflects that consumer apps must move their own compileSdk to 36 to consume this release - enforced by AAR metadata via Gradle's checkAarMetadata task. See AEPSDK_API36_Upgrade_Plan.md ยง4 for the customer impact reasoning. - coreExtensionVersion 3.6.0 -> 4.0.0 (gradle.properties + CoreConstants.kt VERSION) - identityExtensionVersion 3.0.2 -> 4.0.0 (gradle.properties + Identity.java EXTENSION_VERSION) - lifecycleExtensionVersion 3.0.2 -> 4.0.0 (gradle.properties + Lifecycle.java EXTENSION_VERSION) - signalExtensionVersion 3.0.1 -> 4.0.0 (gradle.properties + Signal.java EXTENSION_VERSION) - testutils moduleVersion 3.0.0 -> 4.0.0 (hardcoded in testutils/build.gradle.kts) --- .../com/adobe/marketing/mobile/internal/CoreConstants.kt | 2 +- code/gradle.properties | 8 ++++---- .../phone/java/com/adobe/marketing/mobile/Identity.java | 2 +- .../phone/java/com/adobe/marketing/mobile/Lifecycle.java | 2 +- .../src/phone/java/com/adobe/marketing/mobile/Signal.java | 2 +- code/testutils/build.gradle.kts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt b/code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt index daadaaa07..15df924e9 100644 --- a/code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt +++ b/code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt @@ -13,7 +13,7 @@ package com.adobe.marketing.mobile.internal internal object CoreConstants { const val LOG_TAG = "MobileCore" - const val VERSION = "3.6.0" + const val VERSION = "4.0.0" object EventDataKeys { /** diff --git a/code/gradle.properties b/code/gradle.properties index bde0ddad9..08d5d3d32 100644 --- a/code/gradle.properties +++ b/code/gradle.properties @@ -5,22 +5,22 @@ android.useAndroidX=true #Maven artifacts #Core extension -coreExtensionVersion=3.6.0 +coreExtensionVersion=4.0.0 coreExtensionName=core coreMavenRepoName=AdobeMobileCoreSdk coreMavenRepoDescription=Android Core Extension for Adobe Mobile Marketing #Signal extension -signalExtensionVersion=3.0.1 +signalExtensionVersion=4.0.0 signalExtensionName=signal signalMavenRepoName=AdobeMobileSignalSdk signalMavenRepoDescription=Android Signal Extension for Adobe Mobile Marketing #Lifecycle extension -lifecycleExtensionVersion=3.0.2 +lifecycleExtensionVersion=4.0.0 lifecycleExtensionName=lifecycle lifecycleMavenRepoName=AdobeMobileLifecycleSdk lifecycleMavenRepoDescription=Android Lifecycle Extension for Adobe Mobile Marketing #Identity extension -identityExtensionVersion=3.0.2 +identityExtensionVersion=4.0.0 identityExtensionName=identity identityMavenRepoName=AdobeMobileIdentitySdk identityMavenRepoDescription=Android Identity Extension for Adobe Mobile Marketing diff --git a/code/identity/src/phone/java/com/adobe/marketing/mobile/Identity.java b/code/identity/src/phone/java/com/adobe/marketing/mobile/Identity.java index 1b539acbe..69d8fc64b 100644 --- a/code/identity/src/phone/java/com/adobe/marketing/mobile/Identity.java +++ b/code/identity/src/phone/java/com/adobe/marketing/mobile/Identity.java @@ -26,7 +26,7 @@ public class Identity { private static final String CLASS_NAME = "Identity"; - private static final String EXTENSION_VERSION = "3.0.2"; + private static final String EXTENSION_VERSION = "4.0.0"; private static final String REQUEST_IDENTITY_EVENT_NAME = "IdentityRequestIdentity"; private static final int PUBLIC_API_TIME_OUT_MILLISECOND = 500; // ms private static final String LOG_TAG = "Identity"; diff --git a/code/lifecycle/src/phone/java/com/adobe/marketing/mobile/Lifecycle.java b/code/lifecycle/src/phone/java/com/adobe/marketing/mobile/Lifecycle.java index 5e34a60c5..e4df5ee23 100644 --- a/code/lifecycle/src/phone/java/com/adobe/marketing/mobile/Lifecycle.java +++ b/code/lifecycle/src/phone/java/com/adobe/marketing/mobile/Lifecycle.java @@ -15,7 +15,7 @@ public class Lifecycle { - private static final String EXTENSION_VERSION = "3.0.2"; + private static final String EXTENSION_VERSION = "4.0.0"; public static final Class EXTENSION = LifecycleExtension.class; diff --git a/code/signal/src/phone/java/com/adobe/marketing/mobile/Signal.java b/code/signal/src/phone/java/com/adobe/marketing/mobile/Signal.java index d3b0d9f5c..6a4bd565a 100644 --- a/code/signal/src/phone/java/com/adobe/marketing/mobile/Signal.java +++ b/code/signal/src/phone/java/com/adobe/marketing/mobile/Signal.java @@ -15,7 +15,7 @@ public class Signal { - private static final String EXTENSION_VERSION = "3.0.1"; + private static final String EXTENSION_VERSION = "4.0.0"; private static final String CLASS_NAME = "Signal"; public static final Class EXTENSION = SignalExtension.class; diff --git a/code/testutils/build.gradle.kts b/code/testutils/build.gradle.kts index 90623eb75..eb3e2842a 100644 --- a/code/testutils/build.gradle.kts +++ b/code/testutils/build.gradle.kts @@ -23,7 +23,7 @@ val jacksonVersion = "2.12.7" aepLibrary { namespace = "com.adobe.marketing.mobile.testutils" moduleName = "testutils" - moduleVersion = "3.0.0" + moduleVersion = "4.0.0" enableSpotless = true enableSpotlessPrettierForJava = true enableDokkaDoc = true