From d3f9bb4c00c8889d69caee38cf1786d7c86cf471 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 31 Mar 2024 17:33:16 +0530
Subject: [PATCH] fix(build): switch over to `includeGroupAndSubgroups` API

The bug that broke this was fixed in Gradle 8.7
---
 build-logic/settings.gradle.kts | 2 +-
 settings.gradle.kts             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 8eb9f82e..aac5c95d 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -27,8 +27,8 @@ pluginManagement {
       forRepository { google() }
       filter {
         includeGroup("androidx.databinding")
-        includeGroupByRegex("com.android.*")
         includeGroup("com.google.testing.platform")
+        includeGroupAndSubgroups("com.android")
       }
     }
     mavenCentral { mavenContent { releasesOnly() } }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f938db2e..677c6a4e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,8 +14,8 @@ pluginManagement {
         includeGroup("androidx.baselineprofile")
         includeGroup("androidx.benchmark")
         includeGroup("androidx.databinding")
-        includeGroupByRegex("com.android.*")
         includeGroup("com.google.testing.platform")
+        includeGroupAndSubgroups("com.android")
       }
     }
     exclusiveContent {
@@ -73,8 +73,8 @@ dependencyResolutionManagement {
   repositories {
     google {
       content {
-        includeGroupByRegex("androidx.*")
-        includeGroupByRegex("com.android.*")
+        includeGroupAndSubgroups("androidx")
+        includeGroupAndSubgroups("com.android")
         includeGroup("com.google.android.gms")
         includeModule("com.google.android.material", "material")
         includeGroup("com.google.testing.platform")