For #27336: Combine Google package name regex

This commit is contained in:
chettas 2022-10-18 13:25:46 +05:30 committed by mergify[bot]
parent 5e44259f17
commit 5f51a62424
2 changed files with 5 additions and 22 deletions

View File

@ -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
}
}
}

View File

@ -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\\..*"
}