mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch 'ktsmaven' into 'master'
scanner: fix maven url check for kts files See merge request fdroid/fdroidserver!1162
This commit is contained in:
commit
e7a7f12cae
@ -44,7 +44,7 @@ options = None
|
||||
DEFAULT_JSON_PER_BUILD = {'errors': [], 'warnings': [], 'infos': []} # type: ignore
|
||||
json_per_build = deepcopy(DEFAULT_JSON_PER_BUILD)
|
||||
|
||||
MAVEN_URL_REGEX = re.compile(r"""\smaven\s*{.*?(?:setUrl|url)\s*=?\s*(?:uri)?\(?\s*["']?([^\s"']+)["']?[^}]*}""",
|
||||
MAVEN_URL_REGEX = re.compile(r"""\smaven\s*(?:{.*?(?:setUrl|url)|\((?:url)?)\s*=?\s*(?:uri)?\(?\s*["']?([^\s"']+)["']?[^})]*[)}]""",
|
||||
re.DOTALL)
|
||||
|
||||
CODE_SIGNATURES = {
|
||||
|
@ -776,3 +776,5 @@
|
||||
- ' maven{ url ''https://maven.aliyun.com/repository/public''}'
|
||||
- ' maven{url "https://jitpack.io"}'
|
||||
- ' maven{url "https://plugins.gradle.org/m2/"}'
|
||||
- ' maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")'
|
||||
- ' maven(url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")'
|
||||
|
@ -54,6 +54,7 @@ class ScannerTest(unittest.TestCase):
|
||||
'se.manyver': 2,
|
||||
'com.jens.automation2': 2,
|
||||
'com.github.shadowsocks': 6,
|
||||
'org.tasks': 1,
|
||||
}
|
||||
for d in glob.glob(os.path.join(source_files, '*')):
|
||||
build = fdroidserver.metadata.Build()
|
||||
|
Loading…
Reference in New Issue
Block a user