From 81b9b699a278a779da598a04ea9f7ec5a4111ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= <m.gaetan89@gmail.com>
Date: Wed, 27 Aug 2025 10:01:58 +0200
Subject: [PATCH] Include `:tests` in `settings.gradle`

This commit makes the `:tests` module available in a Gradle build.
This fixes false-positives in the version catalog (`dexmaker` not being used for example).
---
 gradle/libs.versions.toml | 2 +-
 settings.gradle           | 2 ++
 tests/build.gradle        | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a6b3eefe231..988095b2c42 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,7 +36,7 @@ androidXViewPager2                   = "1.0.0"
 androidXWindow                       = "1.0.0"
 dagger                               = "2.51.1"
 dexmaker                             = "1.2"
-errorProneAnnotations                 = "2.15.0"
+errorProneAnnotations                = "2.15.0"
 glide                                = "4.16.0"
 guava                                = "33.3.1-android"
 junit                                = "4.13.2"
diff --git a/settings.gradle b/settings.gradle
index 5d80e534346..3aa202d91c9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,7 @@
 include ':lib'
 
+include ':tests'
+
 include ':testing:java:com:google:android:material:testapp'
 include ':testing:java:com:google:android:material:testapp:animation'
 include ':testing:java:com:google:android:material:testapp:base'
diff --git a/tests/build.gradle b/tests/build.gradle
index 256e3769d2c..bca50438ebe 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -13,6 +13,8 @@ dependencies {
 }
 
 android {
+  namespace "com.google.android.material"
+
   defaultConfig {
     testApplicationId "com.google.android.material.tests"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"