From c04840618d5788e17b1ba63021eee3372dc7ddd1 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Thu, 28 May 2026 16:32:18 -0400
Subject: [PATCH] Bump Dependency Analysis Gradle Plugin to 3.14.0 and filter
 R-class duplicate warnings

R classes are duplicated by design between :app and its library dependencies,
so DAGP's duplicate-class detection flags them as false positives. Filter them
via excludeRegex rather than disabling the check entirely.

https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1335
---
 build.gradle              | 7 +++++++
 gradle/libs.versions.toml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index cdf27fdece..69343e9cec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -168,6 +168,13 @@ dependencyAnalysis {
                 // We explicitly want to pull in these dependencies transitively from AC
                 exclude('org.mozilla.appservices.nightly:fxaclient', 'org.mozilla.geckoview:geckoview-nightly-omni')
             }
+            onDuplicateClassWarnings {
+                // Android R classes are duplicated by design between :app and its library
+                // dependencies, so they're not a real classpath conflict. Filter them out
+                // rather than disabling duplicate-class detection entirely.
+                // https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1335
+                excludeRegex('.*[./]R(\\$.*)?')
+            }
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2ee90f0c66..0c68c0129d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -42,7 +42,7 @@ androidx-test-uiautomator = "2.4.0-beta02"
 
 # Third Party Linting & Static Code Analysis
 androidx-lint = "1.0.0-rc01"
-dependency-analysis = "3.10.0"
+dependency-analysis = "3.14.0"
 detekt = "1.23.8"
 jspecify = "1.0.0"
 ktlint = "1.8.0"