Merge branch 'jvm-download' into 'master'

disable gradle jvm auto download

See merge request fdroid/fdroidserver!1798

buildserver/provision-gradle

@@ -14,6 +14,9 @@ cat <<EOF > $GRADLE_HOME/gradle.properties
 # builds are not reused, so the daemon is a waste of time
 org.gradle.daemon=false
 
+# disable jvm auto-provisioning
+org.gradle.java.installations.auto-download=false
+
 # set network timeouts to 10 minutes
 # https://github.com/gradle/gradle/pull/3371/files
 systemProp.http.connectionTimeout=600000

fdroidserver/scanner.py

@@ -974,7 +974,12 @@ def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
                     filepath,
                     json_per_build,
                 )
-            elif curfile in ('gradle-wrapper.jar', 'gradlew', 'gradlew.bat'):
+            elif curfile in (
+                'gradle-wrapper.jar',
+                'gradlew',
+                'gradlew.bat',
+                'gradle-daemon-jvm.properties',
+            ):
                 removeproblem(curfile, path_in_build_dir, filepath, json_per_build)
             elif curfile.endswith('.apk'):
                 removeproblem(

tests/test_scanner.py

@@ -302,7 +302,12 @@ class ScannerTest(SetUpTearDownMixin, unittest.TestCase):
             'static.a',
             'src/test/resources/classes.dex',
         ]
-        remove = ['gradle-wrapper.jar', 'gradlew', 'gradlew.bat']
+        remove = [
+            'gradle-wrapper.jar',
+            'gradlew',
+            'gradlew.bat',
+            'gradle-daemon-jvm.properties',
+        ]
         os.makedirs('src/test/resources', exist_ok=True)
         for f in keep + remove:
             with open(f, 'w') as fp: