From f99dbec012683686183490faf9aaf849949b2004 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 7 Aug 2022 17:55:39 +0800
Subject: [PATCH] scanner: fix maven url check for kts files

---
 fdroidserver/scanner.py        | 2 +-
 tests/gradle-maven-blocks.yaml | 2 ++
 tests/scanner.TestCase         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 0c2a5751..a67cf5b7 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -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 = {
diff --git a/tests/gradle-maven-blocks.yaml b/tests/gradle-maven-blocks.yaml
index f6587f94..886bb667 100644
--- a/tests/gradle-maven-blocks.yaml
+++ b/tests/gradle-maven-blocks.yaml
@@ -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")'
diff --git a/tests/scanner.TestCase b/tests/scanner.TestCase
index 2e5f6305..7f04bb18 100755
--- a/tests/scanner.TestCase
+++ b/tests/scanner.TestCase
@@ -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()