scanner: catalog: relax VERSION_CATALOG_REGEX

There may be other blocks in dependencyResolutionManagement
2026-05-10 00:34:35 -04:00 · 2024-09-28 01:53:04 +08:00
parent 4c3dd9c76c
commit 24dc3baadf
2 changed files with 4 additions and 3 deletions
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -73,9 +73,7 @@ GRADLE_KTS_CATALOG_FILE_REGEX = re.compile(
 GRADLE_CATALOG_FILE_REGEX = re.compile(
    r'''(\w+)\s*\{[^}]*from\(files\(['"]([^"]+)['"]\)\)'''
 )
-VERSION_CATALOG_REGEX = re.compile(
-    r'dependencyResolutionManagement\s*\{[^}]*versionCatalogs\s*\{'
-)
+VERSION_CATALOG_REGEX = re.compile(r'versionCatalogs\s*\{')


 class ExitCode(IntEnum):
--- a/tests/source-files/catalog.test/settings.gradle.kts
+++ b/tests/source-files/catalog.test/settings.gradle.kts
@@ -1,4 +1,7 @@
 dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
    defaultLibrariesExtensionName = "projectLibs"
    versionCatalogs {
        create("libs") {