Merge branch 'master' into 'master'

Support `Uri.create()` syntax for maven repositories

Closes #1180

See merge request fdroid/fdroidserver!1412
This commit is contained in:
Hans-Christoph Steiner
2023-12-07 09:58:53 +00:00

View File

@@ -50,7 +50,7 @@ class MessageStore:
errors: list = field(default_factory=list)
MAVEN_URL_REGEX = re.compile(r"""\smaven\s*(?:{.*?(?:setUrl|url)|\((?:url)?)\s*=?\s*(?:uri)?\(?\s*["']?([^\s"']+)["']?[^})]*[)}]""",
MAVEN_URL_REGEX = re.compile(r"""\smaven\s*(?:{.*?(?:setUrl|url)|\((?:url)?)\s*=?\s*(?:uri|Uri\.create\()?\(?\s*["']?([^\s"']+)["']?[^})]*[)}]""",
re.DOTALL)