From f538db8f5d08ccf4f5bc7c4db5d49c15fbf9f957 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2026 19:12:26 +0000 Subject: [PATCH 1/2] chore: bump androidx.test.ext:junit from 1.1.4 to 1.3.0 Bumps androidx.test.ext:junit from 1.1.4 to 1.3.0. --- updated-dependencies: - dependency-name: androidx.test.ext:junit dependency-version: 1.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- testutils/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testutils/build.gradle b/testutils/build.gradle index 41e0938f9..be3881488 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -70,7 +70,7 @@ dependencies { compileOnly 'org.mockito:mockito-android:4.9.0' api 'androidx.annotation:annotation:1.5.0' - api 'androidx.test.ext:junit:1.1.4' + api 'androidx.test.ext:junit:1.3.0' api 'androidx.test:rules:1.5.0' androidTestCompileOnly project(':android-core') @@ -82,7 +82,7 @@ dependencies { } androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation 'com.google.firebase:firebase-messaging:20.0.0' From 63c37f0824f0de6cdbf11862efe59a76e866fb07 Mon Sep 17 00:00:00 2001 From: Thomson Thomas Date: Thu, 10 Sep 2026 10:02:57 -0400 Subject: [PATCH 2/2] fix: align dependabot with main and unblock junit 1.3.0 androidTest merge Remove the stale chore/dependabot target branch so Gradle dependency PRs match other mParticle SDK repos. Add androidTest manifest overrides for androidx.test libraries that require minSdk 21. Co-authored-by: Cursor --- .github/dependabot.yml | 41 +++++++++---------- .../src/androidTest/AndroidManifest.xml | 2 +- .../src/androidTest/AndroidManifest.xml | 2 +- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 835d88e8f..f2e0c0968 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,23 +1,22 @@ version: 2 updates: - - package-ecosystem: gradle - directory: "/" - schedule: - interval: daily - target-branch: "chore/dependabot" - labels: ["dependabot"] - open-pull-requests-limit: 10 - ignore: - - dependency-name: "com.mparticle:android-core" - - dependency-name: "com.google.firebase:firebase-messaging" - commit-message: - prefix: "chore" - - package-ecosystem: github-actions - directory: / - schedule: - interval: weekly - open-pull-requests-limit: 4 - labels: - - dependabot - commit-message: - prefix: "chore" + - package-ecosystem: gradle + directory: "/" + schedule: + interval: daily + labels: ["dependabot"] + open-pull-requests-limit: 10 + ignore: + - dependency-name: "com.mparticle:android-core" + - dependency-name: "com.google.firebase:firebase-messaging" + commit-message: + prefix: "chore" + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + open-pull-requests-limit: 4 + labels: + - dependabot + commit-message: + prefix: "chore" diff --git a/android-core/src/androidTest/AndroidManifest.xml b/android-core/src/androidTest/AndroidManifest.xml index b3bfd6cba..218e1d895 100644 --- a/android-core/src/androidTest/AndroidManifest.xml +++ b/android-core/src/androidTest/AndroidManifest.xml @@ -3,7 +3,7 @@ + tools:overrideLibrary="com.mparticle.testutils,androidx.test.ext.junit,androidx.test.core,androidx.test.monitor,androidx.test.services.storage" /> diff --git a/android-kit-base/src/androidTest/AndroidManifest.xml b/android-kit-base/src/androidTest/AndroidManifest.xml index cf70d191e..93584a7cf 100644 --- a/android-kit-base/src/androidTest/AndroidManifest.xml +++ b/android-kit-base/src/androidTest/AndroidManifest.xml @@ -3,7 +3,7 @@ + tools:overrideLibrary="com.mparticle.testutils,androidx.test.ext.junit,androidx.test.core,androidx.test.monitor,androidx.test.services.storage" />