From 7723311b44bedff96b646b91251e4344a90ce5df Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Wed, 18 Mar 2026 04:08:13 +0800 Subject: [PATCH] disable gradle jvm auto download --- buildserver/provision-gradle | 3 +++ fdroidserver/scanner.py | 7 ++++++- tests/test_scanner.py | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/buildserver/provision-gradle b/buildserver/provision-gradle index 7b7ab7ca..92249084 100644 --- a/buildserver/provision-gradle +++ b/buildserver/provision-gradle @@ -14,6 +14,9 @@ cat < $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 diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index c63b0e1f..baa64309 100644 --- a/fdroidserver/scanner.py +++ b/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( diff --git a/tests/test_scanner.py b/tests/test_scanner.py index b932bffd..948eb485 100755 --- a/tests/test_scanner.py +++ b/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: