From df97ebe05298b6c0261d2dfbc1c2dd05687cfc7c Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Fri, 17 May 2024 18:30:08 +0300
Subject: [PATCH 1/2] scanner - pickup by id, sort list

---
 fdroidserver/scanner.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index c17e7c29..fc9ef13a 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -60,13 +60,14 @@ class ExitCode(IntEnum):
 
 
 def get_gradle_compile_commands(build):
-    compileCommands = ['compile',
-                       'provided',
+    compileCommands = ['api',
                        'apk',
-                       'implementation',
                        'classpath',
-                       'api',
+                       'compile',
                        'compileOnly',
+                       'id',
+                       'implementation',
+                       'provided',
                        'runtimeOnly']
     buildTypes = ['', 'release']
     flavors = ['']

From 98f935493e493680725ae1534d7c0b6e96de22f0 Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Tue, 21 May 2024 15:07:51 +0000
Subject: [PATCH 2/2] fix test cases

---
 tests/scanner.TestCase | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/scanner.TestCase b/tests/scanner.TestCase
index 6a85b7f3..76cece25 100755
--- a/tests/scanner.TestCase
+++ b/tests/scanner.TestCase
@@ -53,7 +53,7 @@ class ScannerTest(unittest.TestCase):
             'OtakuWorld': 2,
             'Zillode': 1,
             'cn.wildfirechat.chat': 4,
-            'com.github.shadowsocks': 7,
+            'com.github.shadowsocks': 10,
             'com.integreight.onesheeld': 16,
             'com.jens.automation2': 3,
             'firebase-suspect': 1,
@@ -76,7 +76,7 @@ class ScannerTest(unittest.TestCase):
             ('source-files/com.nextcloud.client/build.gradle', 'generic', 28),
             ('source-files/com.kunzisoft.testcase/build.gradle', 'libre', 4),
             ('source-files/cn.wildfirechat.chat/chat/build.gradle', 'yes', 33),
-            ('source-files/org.tasks/app/build.gradle.kts', 'generic', 39),
+            ('source-files/org.tasks/app/build.gradle.kts', 'generic', 43),
             ('source-files/at.bitfire.davdroid/build.gradle', 'standard', 16),
             ('source-files/se.manyver/android/app/build.gradle', 'indie', 29),
             ('source-files/osmandapp/osmand/build.gradle', 'free', 5),