kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-15 03:20:10 +01:00
Code Activity

scanner: catalog: relax VERSION_CATALOG_REGEX

Browse Source 
There may be other blocks in dependencyResolutionManagement
This commit is contained in:
linsui 2024-09-28 01:53:04 +08:00
parent 4c3dd9c76c
commit 24dc3baadf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/scanner.py
View File

@ -73,9 +73,7 @@ GRADLE_KTS_CATALOG_FILE_REGEX = re.compile(
GRADLE_CATALOG_FILE_REGEX = re.compile( GRADLE_CATALOG_FILE_REGEX = re.compile(
r'''(\w+)\s*\{[^}]*from\(files\(['"]([^"]+)['"]\)\)''' r'''(\w+)\s*\{[^}]*from\(files\(['"]([^"]+)['"]\)\)'''
) )
VERSION_CATALOG_REGEX = re.compile( VERSION_CATALOG_REGEX = re.compile(r'versionCatalogs\s*\{')
r'dependencyResolutionManagement\s*\{[^}]*versionCatalogs\s*\{'
)
class ExitCode(IntEnum): class ExitCode(IntEnum):

3
tests/source-files/catalog.test/settings.gradle.kts
View File

@ -1,4 +1,7 @@
dependencyResolutionManagement { dependencyResolutionManagement {
repositories {
mavenCentral()
}
defaultLibrariesExtensionName = "projectLibs" defaultLibrariesExtensionName = "projectLibs"
versionCatalogs { versionCatalogs {
create("libs") { create("libs") {