From a0a766cc8eeb423a87aaed03561fa513853a5aac Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Wed, 31 Jan 2024 23:08:04 +0800 Subject: [PATCH] drop gradle support before 2.0 debian bullseye supports only Java 8+, which is compatible with gradle 2.0+: https://docs.gradle.org/current/userguide/compatibility.html --- gradlew-fdroid | 2 +- tests/test-gradlew-fdroid | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradlew-fdroid b/gradlew-fdroid index 65b50eb3..12319fb1 100755 --- a/gradlew-fdroid +++ b/gradlew-fdroid @@ -215,7 +215,7 @@ contains() { # (key) should accept. plugin versions are actually prefixes and catch sub- # versions as well. Pairs are taken from: # https://developer.android.com/studio/releases/gradle-plugin#updating-gradle -d_gradle_plugin_ver_k=(8.4 8.3 8.2 8.1 8.0 7.4 7.3 7.2.0 7.1 7.0 4.2 4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.3 2.2 2.1.3 2.1 2.0 1.5 1.3 1.2 1.1 1.0 0.14 0.13 0.12 0.11 0.10 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2) +d_gradle_plugin_ver_k=(8.4 8.3 8.2 8.1 8.0 7.4 7.3 7.2.0 7.1 7.0 4.2 4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.3 2.2 2.1.3 2.1 2.0) d_plugin_min_gradle_v=(8.6 8.4 8.2 8.0 8.0 7.5 7.4 7.3.3 7.2 7.0.2 6.7.1 6.5 6.1.1 5.6.4 5.4.1 5.1.1 4.10.1 4.6 4.4 4.1 3.3 2.14.1 2.14.1 2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1 2.1 2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4) # All gradle versions we know about diff --git a/tests/test-gradlew-fdroid b/tests/test-gradlew-fdroid index 3d6d6016..b8c65360 100755 --- a/tests/test-gradlew-fdroid +++ b/tests/test-gradlew-fdroid @@ -56,7 +56,7 @@ run_test osmandapp/osmand 2.2.1 cd $tmpdir mkdir -p download_cache_test/gradle/wrapper cd download_cache_test -echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-0.7-bin.zip' \ +echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip' \ > gradle/wrapper/gradle-wrapper.properties printf "task helloWorld {\n\tdoLast {\n\t\tprintln '$TEST_VALUE'\n\t}\n}" > build.gradle @@ -65,11 +65,11 @@ mkdir -p $GRADLE_VERSION_DIR unset https_proxy printf "download, unpack, and run: " -download_cache_test 0.7 +download_cache_test 2.0 printf "unpack and run: " -rm -rf $GRADLE_VERSION_DIR/0.7/ -download_cache_test 0.7 +rm -rf $GRADLE_VERSION_DIR/2.0/ +download_cache_test 2.0 printf "just run: " -download_cache_test 0.7 +download_cache_test 2.0 exit $exit_value