From a002e46997b30649d151be73d55df8714b376510 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Tue, 12 Mar 2024 07:57:11 +0000
Subject: [PATCH] scanner: update maven repo regex

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

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index c875b4ea..8c0a5d06 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -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|Uri\.create\()?\(?\s*["']?([^\s"']+)["']?[^})]*[)}]""",
+MAVEN_URL_REGEX = re.compile(r"""\smaven\s*(?:{.*?(?:setUrl|url)|\(\s*(?:url)?)\s*=?\s*(?:uri|URI|Uri\.create)?\(?\s*["']?([^\s"']+)["']?[^})]*[)}]""",
                              re.DOTALL)
 
 
diff --git a/tests/gradle-maven-blocks.yaml b/tests/gradle-maven-blocks.yaml
index 886bb667..6db683f9 100644
--- a/tests/gradle-maven-blocks.yaml
+++ b/tests/gradle-maven-blocks.yaml
@@ -759,6 +759,7 @@
 - ' maven { url ''libs'' }'
 - ' maven { url = uri("https://jitpack.io") }'
 - ' maven { url = uri("https://maven.fabric.io/public") }'
+- ' maven { url = URI("https://jitpack.io") }'
 - ' maven { url MAVEN_REPO_CACHE }'
 - ' maven { url(''http://releases.marmeladburk.fidesmo.com/'') }'
 - ' maven {url "http://dl.bintray.com/tbruyelle/tbruyelle" }'
@@ -778,3 +779,5 @@
 - ' 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")'
+- ' maven ( url = "https://jitpack.io")'
+- ' maven( url = "https://oss.sonatype.org/content/repositories/snapshots/" )'