diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index b0783bfa..9aa16bb7 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -20,8 +20,8 @@ import itertools import json import logging import os -import re import stat +import re import sys import traceback import urllib.parse @@ -284,7 +284,7 @@ def get_gradle_compile_commands_without_catalog(build): def get_gradle_compile_commands_with_catalog(build, prefix): return [ - re.compile(rf"""\s*\S*{c}\S*\s*\(?{prefix}\.([a-z0-9.]+)""", re.IGNORECASE) + re.compile(rf'\s*{c}.*\s*\(?{prefix}\.([a-z0-9.]+)', re.IGNORECASE) for c in get_gradle_compile_commands(build) ] diff --git a/tests/source-files/catalog.test/buildSrc/build.gradle.kts b/tests/source-files/catalog.test/buildSrc/build.gradle.kts index 944d53d4..40eeaa54 100644 --- a/tests/source-files/catalog.test/buildSrc/build.gradle.kts +++ b/tests/source-files/catalog.test/buildSrc/build.gradle.kts @@ -6,5 +6,4 @@ plugins { dependencies { implementation(libs.plugins.androidApplication.asLibraryDependency) - "playImplementation"(libs.firebase.core) } diff --git a/tests/test_scanner.py b/tests/test_scanner.py index 99eea021..96f477ac 100755 --- a/tests/test_scanner.py +++ b/tests/test_scanner.py @@ -124,7 +124,7 @@ class ScannerTest(SetUpTearDownMixin, unittest.TestCase): 'se.manyver': 3, 'lockfile.test': 1, 'com.lolo.io.onelist': 6, - 'catalog.test': 23, + 'catalog.test': 22, } for d in (basedir / 'source-files').iterdir(): build = fdroidserver.metadata.Build()