From 5f51a6242485d062c0279a1a5061bcbd522f3d9a Mon Sep 17 00:00:00 2001 From: chettas Date: Tue, 18 Oct 2022 13:25:46 +0530 Subject: [PATCH] For #27336: Combine Google package name regex --- build.gradle | 16 ++++------------ buildSrc/src/main/java/Dependencies.kt | 11 +---------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 9bc9853df..3241aff78 100644 --- a/build.gradle +++ b/build.gradle @@ -34,10 +34,8 @@ buildscript { content { // Improve performance: only check google maven for google deps. includeGroupByRegex RepoMatching.androidx - includeGroupByRegex RepoMatching.comGoogleAndroid - includeGroupByRegex RepoMatching.comGoogleFirebase - includeGroupByRegex RepoMatching.comGoogleTesting includeGroupByRegex RepoMatching.comAndroid + includeGroupByRegex RepoMatching.comGoogle } } } @@ -54,10 +52,8 @@ buildscript { // Improve security: don't search deps with known repos. excludeGroupByRegex RepoMatching.mozilla excludeGroupByRegex RepoMatching.androidx - excludeGroupByRegex RepoMatching.comGoogleAndroid - excludeGroupByRegex RepoMatching.comGoogleFirebase - excludeGroupByRegex RepoMatching.comGoogleTesting excludeGroupByRegex RepoMatching.comAndroid + excludeGroupByRegex RepoMatching.comGoogle } } } @@ -114,10 +110,8 @@ allprojects { content { // Improve performance: only check google maven for google deps. includeGroupByRegex RepoMatching.androidx - includeGroupByRegex RepoMatching.comGoogleAndroid - includeGroupByRegex RepoMatching.comGoogleFirebase - includeGroupByRegex RepoMatching.comGoogleTesting includeGroupByRegex RepoMatching.comAndroid + includeGroupByRegex RepoMatching.comGoogle } } } @@ -134,10 +128,8 @@ allprojects { // Improve security: don't search deps with known repos. excludeGroupByRegex RepoMatching.mozilla excludeGroupByRegex RepoMatching.androidx - excludeGroupByRegex RepoMatching.comGoogleAndroid - excludeGroupByRegex RepoMatching.comGoogleFirebase - excludeGroupByRegex RepoMatching.comGoogleTesting excludeGroupByRegex RepoMatching.comAndroid + excludeGroupByRegex RepoMatching.comGoogle } } } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 1fa8457be..855c1746a 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -281,14 +281,5 @@ object RepoMatching { const val mozilla = "org\\.mozilla\\..*" const val androidx = "androidx\\..*" const val comAndroid = "com\\.android.*" - const val comGoogleFirebase = "com\\.google\\.firebase" - const val comGoogleTesting = "com\\.google\\.testing\\..*" - - /** - * A matcher for com.google.android.* with one exception: the espresso-contrib dependency includes the - * accessibility-test-framework dependency, which is not available in the google repo. As such, we must - * explicitly exclude it from this regex so it can be found on Maven Central. Note that the transitive - * dependency com.google.guava is also not available on google's repo. - */ - const val comGoogleAndroid = "com\\.google\\.android\\..*" + const val comGoogle = "com\\.google\\..*" }