feat: split LogoutListener from AttributeListener

.github/workflows/daily.yml

@@ -224,6 +224,8 @@ jobs:
         uses: actions/checkout@v6
         with:
           ref: regression/${{ github.run_number }}
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
@@ -233,12 +235,11 @@ jobs:
       - name: "Run Android Core SDK Lint"
         run: ./gradlew lint
       - name: "Setup Android Kit Lint"
-        run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
+        run: ./gradlew publishMavenPublicationToMavenLocal
       - name: "Run Android Kit Lint"
-        run: ./gradlew lint -c settings-kits.gradle
+        run: ./gradlew lint -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Run Isolated Kit Lint (urbanairship-kit)"
-        working-directory: kits/urbanairship/urbanairship-20
-        run: ./gradlew lint
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 lint
       - name: "Archive Test Results"
         uses: actions/upload-artifact@v7
         if: always()
@@ -262,6 +263,8 @@ jobs:
         uses: actions/checkout@v6
         with:
           ref: regression/${{ github.run_number }}
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
@@ -271,12 +274,11 @@ jobs:
       - name: "Run Android Core SDK Kotlin Lint"
         run: ./gradlew ktlintCheck
       - name: "Setup Android Kit Kotlin Lint"
-        run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
+        run: ./gradlew publishMavenPublicationToMavenLocal
       - name: "Run Android Kit Kotlin Lint"
-        run: ./gradlew ktlintCheck -c settings-kits.gradle
+        run: ./gradlew ktlintCheck -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Run Isolated Kit Kotlin Lint (urbanairship-kit)"
-        working-directory: kits/urbanairship/urbanairship-20
-        run: ./gradlew ktlintCheck
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 ktlintCheck
       - name: "Archive Test Results"
         uses: actions/upload-artifact@v7
         if: always()
@@ -305,19 +307,20 @@ jobs:
         with:
           repository: mparticle/mparticle-android-sdk
           ref: regression/${{ github.run_number }}
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
           distribution: "zulu"
           java-version: "17"
           cache: "gradle"
       - name: "Build Android Core"
-        run: ./gradlew clean publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
+        run: ./gradlew clean publishMavenPublicationToMavenLocal
       - name: "Test Kits"
-        run: ./gradlew clean testRelease -c settings-kits.gradle
+        run: ./gradlew clean testRelease -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Test Isolated Kits (urbanairship-kit)"
-        working-directory: kits/urbanairship/urbanairship-20
-        run: ./gradlew clean testRelease
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 clean testRelease
 
   semantic-release-dryrun:
     name: "Test Semantic Release - Dry Run"

.github/workflows/pull-request.yml

@@ -100,6 +100,8 @@ jobs:
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@v6
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
@@ -108,9 +110,9 @@ jobs:
       - name: "Run Android Core SDK Lint"
         run: ./gradlew lint
       - name: "Setup Android Kit Lint"
-        run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
+        run: ./gradlew publishMavenPublicationToMavenLocal
       - name: "Run Android Kit Lint"
-        run: ./gradlew -c settings-kits.gradle lint
+        run: ./gradlew -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true lint
       - name: "Archive Lint Test Results"
         uses: actions/upload-artifact@v7
         if: always()
@@ -125,6 +127,8 @@ jobs:
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@v6
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
@@ -133,9 +137,9 @@ jobs:
       - name: "Run Android Core SDK Kotlin Lint"
         run: ./gradlew ktlintCheck
       - name: "Setup Android Kit Kotlin Lint"
-        run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
+        run: ./gradlew publishMavenPublicationToMavenLocal
       - name: "Run Android Kit Kotlin Lint"
-        run: ./gradlew -c settings-kits.gradle ktlintCheck
+        run: ./gradlew -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true ktlintCheck
       - name: "Archive Kotlin Lint Test Results"
         uses: actions/upload-artifact@v7
         if: always()
@@ -156,20 +160,21 @@ jobs:
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@v6
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
           distribution: "zulu"
           java-version: "17"
       - name: "Generate Core Release Build"
-        run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
+        run: ./gradlew publishMavenPublicationToMavenLocal
       - name: "Run Kit-Base Release Tests and Build"
-        run: ./gradlew :android-kit-base:testRelease -PVERSION=$(head -n 1 VERSION)
+        run: ./gradlew :android-kit-base:testRelease
       - name: "Run Kit Release Tests and Build"
-        run: ./gradlew -p kits testRelease -c ../settings-kits.gradle -PVERSION=$(head -n 1 VERSION)
+        run: ./gradlew -p kits testRelease -c ../settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Run Isolated Kit Compatibility Tests (urbanairship)"
-        working-directory: kits/urbanairship/urbanairship-20
-        run: ./gradlew -PisRelease=true testRelease
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 -PisRelease=true testRelease
 
   automerge-dependabot:
     name: "Save PR Number for Dependabot Automerge"

.trunk/trunk.yaml

@@ -27,11 +27,11 @@ runtimes:
 lint:
   enabled:
     - actionlint@1.7.7
-    - checkov@3.2.470
+    - checkov@3.2.513
     - git-diff-check
     - ktlint@1.7.1
-    - markdownlint@0.45.0
-    - prettier@3.6.2
+    - markdownlint@0.48.0
+    - prettier@3.8.1
     - shellcheck@0.11.0
     - shfmt@3.6.0
     - trufflehog@3.90.6

android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/AttributeListenerTestKit.kt

@@ -1,12 +1,14 @@
 package com.mparticle.kits.testkits
 
 import com.mparticle.MParticle
-import com.mparticle.kits.KitIntegration
+import com.mparticle.kits.KitIntegration.AttributeListener
+import com.mparticle.kits.KitIntegration.LogoutListener
 import com.mparticle.kits.ReportingMessage
 
 open class AttributeListenerTestKit :
     ListenerTestKit(),
-    KitIntegration.AttributeListener {
+    AttributeListener,
+    LogoutListener {
     var setUserAttribute: ((attributeKey: String?, attributeValue: String?) -> Unit)? = null
     var setUserAttributeList: ((attributeKey: String?, attributeValueList: List<String?>?) -> Unit)? =
         null

android-kit-base/src/main/java/com/mparticle/kits/KitIntegration.java

@@ -345,6 +345,21 @@ public interface SessionListener {
         List<ReportingMessage> onSessionEnd();
     }
 
+    /**
+     * Kits may implement this interface to respond when the mParticle Identity API performs a logout.
+     */
+    public interface LogoutListener {
+
+        /**
+         * The mParticle SDK exposes a logout API, allowing developers to track an event
+         * when a user logs out of their app/platform. Use this opportunity to perform the appropriate logic
+         * as per your platforms logout paradigm, such as clearing user attributes.
+         *
+         * @return Kits should return a List of ReportingMessages indicating that the logout was processed one or more times, or null if it was not processed
+         */
+        List<ReportingMessage> logout();
+    }
+
     /**
      * Kits should implement this interface when their underlying service has the notion
      * of a user with attributes.
@@ -374,15 +389,6 @@ public interface AttributeListener {
 
         void removeUserIdentity(MParticle.IdentityType identityType);
 
-        /**
-         * The mParticle SDK exposes a logout API, allowing developers to track an event
-         * when a user logs out of their app/platform. Use this opportunity to perform the appropriate logic
-         * as per your platforms logout paradigm, such as clearing user attributes.
-         *
-         * @return Kits should return a List of ReportingMessages indicating that the logout was processed one or more times, or null if it was not processed
-         */
-        List<ReportingMessage> logout();
-
     }
 
     /**

android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java

@@ -39,6 +39,7 @@
 import com.mparticle.internal.Logger;
 import com.mparticle.internal.MPUtility;
 import com.mparticle.internal.ReportingManager;
+import com.mparticle.kits.KitIntegration.LogoutListener;
 import com.mparticle.kits.mappings.CustomMapping;
 import com.mparticle.rokt.RoktOptions;
 
@@ -809,9 +810,8 @@ public void removeUserIdentity(MParticle.IdentityType identityType) {
     public void logout() {
         for (KitIntegration provider : providers.values()) {
             try {
-                if (provider instanceof KitIntegration.AttributeListener && !provider.isDisabled()) {
-                    List<ReportingMessage> report = ((KitIntegration.AttributeListener) provider).logout();
-                    getReportingManager().logAll(report);
+                if (provider instanceof LogoutListener listener && !provider.isDisabled()) {
+                    getReportingManager().logAll(listener.logout());
                 }
             } catch (Exception e) {
                 Logger.warning("Failed to call logout for kit: " + provider.getName() + ": " + e.getMessage());

kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy

@@ -3,21 +3,22 @@
 import com.android.build.gradle.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.dsl.RepositoryHandler
 
 class KitPlugin implements Plugin<Project> {
     void apply(Project target) {
 
         //formerly in kit-common.gradle
         target.apply(plugin: 'com.android.library')
         target.group = 'com.mparticle'
-        target.buildscript.repositories.add(target.repositories.mavenLocal())
-        target.buildscript.repositories.add(target.repositories.google())
-        target.buildscript.repositories.add(target.repositories.mavenCentral())
-        target.repositories.add(target.repositories.mavenLocal())
-        target.repositories.add(target.repositories.google())
-        target.repositories.add(target.repositories.mavenCentral())
+        boolean mparticleFromMavenLocalOnly = resolveMparticleFromMavenLocalOnly(target)
+        configureRepositories(target.buildscript.repositories, mparticleFromMavenLocalOnly)
+        configureRepositories(target.repositories, mparticleFromMavenLocalOnly)
         target.configurations.create('deployerJars')
-        def kitBaseVersion = target.findProperty('VERSION') ?: '+'
+        // VERSION from CI is often set only on the root project (e.g. ORG_GRADLE_PROJECT_VERSION); kit
+        // subprojects do not always inherit it, which would fall back to '+' and unstable resolution.
+        def kitBaseVersion =
+            target.findProperty('VERSION') ?: target.rootProject.findProperty('VERSION') ?: '+'
         target.dependencies.add('api', 'com.mparticle:android-kit-base:' + kitBaseVersion)
         target.dependencies.add('testImplementation', 'junit:junit:4.13.2')
         target.dependencies.add('testImplementation', 'org.mockito:mockito-core:1.10.19')
@@ -57,5 +58,47 @@
             // no-op: publish plugin unavailable outside monorepo
         }
     }
+
+    /**
+     * When true, {@code com.mparticle} artifacts (e.g. android-kit-base, android-kit-plugin) resolve
+     * only from {@code mavenLocal()}; Maven Central / Google are not queried for that group.
+     * Use after {@code publishMavenPublicationToMavenLocal} so CI and monorepo kit builds use the
+     * freshly published local artifacts. Enable with {@code -Pmparticle.kit.mparticleFromMavenLocalOnly=true}
+     * or env {@code MPARTICLE_KIT_FROM_MAVEN_LOCAL_ONLY=true}.
+     */
+    private static boolean resolveMparticleFromMavenLocalOnly(Project target) {
+        String prop = target.findProperty('mparticle.kit.mparticleFromMavenLocalOnly')?.toString()
+        if (prop != null && Boolean.parseBoolean(prop)) {
+            return true
+        }
+        String env = System.getenv('MPARTICLE_KIT_FROM_MAVEN_LOCAL_ONLY')
+        return env != null && 'true'.equalsIgnoreCase(env)
+    }
+
+    private static void configureRepositories(RepositoryHandler repositories, boolean mparticleFromMavenLocalOnly) {
+        if (mparticleFromMavenLocalOnly) {
+            // Root build scripts may have already attached unfiltered repos. Rebuild this
+            // project's repository chain so com.mparticle cannot resolve outside mavenLocal().
+            def existingRepos = repositories.toList()
+            existingRepos.each { repo ->
+                repositories.remove(repo)
+            }
+            repositories.mavenLocal {
+                content {
+                    includeGroup 'com.mparticle'
+                }
+            }
+            repositories.google()
+            repositories.mavenCentral {
+                content {
+                    excludeGroup 'com.mparticle'
+                }
+            }
+        } else {
+            repositories.mavenLocal()
+            repositories.google()
+            repositories.mavenCentral()
+        }
+    }
 }
 

kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt

@@ -7,6 +7,7 @@ import com.mparticle.internal.MPUtility
 import com.mparticle.internal.MPUtility.AdIdInfo
 import com.mparticle.kits.KitIntegration.ApplicationStateListener
 import com.mparticle.kits.KitIntegration.AttributeListener
+import com.mparticle.kits.KitIntegration.LogoutListener
 import com.mparticle.kits.KitIntegration.PushListener
 import org.json.JSONException
 import org.json.JSONObject
@@ -16,6 +17,7 @@ import java.net.URL
 abstract class AdobeKitBase :
     KitIntegration(),
     AttributeListener,
+    LogoutListener,
     PushListener,
     ApplicationStateListener {
     private val dVer = "2"
@@ -138,7 +140,7 @@ abstract class AdobeKitBase :
             dcsRegion,
             pushId,
             gaid,
-            userIdentities,
+            currentUser?.userIdentities ?: emptyMap(),
         )
     }
 

kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt

@@ -20,6 +20,7 @@ import com.mparticle.MParticle
 import com.mparticle.kits.KitIntegration.ApplicationStateListener
 import com.mparticle.kits.KitIntegration.AttributeListener
 import com.mparticle.kits.KitIntegration.EventListener
+import com.mparticle.kits.KitIntegration.LogoutListener
 import com.mparticle.kits.KitIntegration.PushListener
 import com.mparticle.media.events.ContentType
 import com.mparticle.media.events.EventAttributes
@@ -36,6 +37,7 @@ open class AdobeKit :
     KitIntegration(),
     EventListener,
     AttributeListener,
+    LogoutListener,
     PushListener,
     ApplicationStateListener {
     companion object {

kits/appsflyer/appsflyer-6/src/main/kotlin/com/mparticle/kits/AppsFlyerKit.kt

@@ -31,19 +31,22 @@ import com.mparticle.commerce.Product
 import com.mparticle.consent.ConsentState
 import com.mparticle.internal.Logger
 import com.mparticle.internal.MPUtility
+import com.mparticle.kits.KitIntegration.LogoutListener
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.math.BigDecimal
 import java.util.LinkedList
+import com.mparticle.kits.KitIntegration.AttributeListener
 
 /**
  * mParticle Kit wrapper for the AppsFlyer SDK
  */
 class AppsFlyerKit :
     KitIntegration(),
     KitIntegration.EventListener,
-    KitIntegration.AttributeListener,
+    AttributeListener,
+    LogoutListener,
     KitIntegration.CommerceListener,
     AppsFlyerConversionListener,
     KitIntegration.ActivityListener,

kits/apptimize/apptimize-3/src/main/kotlin/com/mparticle/kits/ApptimizeKit.kt

@@ -13,11 +13,13 @@ import com.mparticle.MParticle.IdentityType
 import com.mparticle.commerce.CommerceEvent
 import com.mparticle.kits.KitIntegration.AttributeListener
 import com.mparticle.kits.KitIntegration.CommerceListener
+import com.mparticle.kits.KitIntegration.LogoutListener
 import java.math.BigDecimal
 
 class ApptimizeKit :
     KitIntegration(),
     AttributeListener,
+    LogoutListener,
     KitIntegration.EventListener,
     CommerceListener,
     OnTestRunListener {