Merge branch 'remove-ndk-r9b' into 'master'

makebuildserver: remove NDK r9b to save 1.6 GB of disk space

See merge request fdroid/fdroidserver!459

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 42c21a8a7f1b5893d1e64fcd4cf7a8f7636533fe..0b0c593fc1adfc97d3744713e5675708db15b78d 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -6,7 +6,7 @@ ndk_paths = {
     'r13b': "/home/vagrant/android-ndk/r13b",
     'r14b': "/home/vagrant/android-ndk/r14b",
     'r15c': "/home/vagrant/android-ndk/r15c",
-    'r16': "/home/vagrant/android-ndk/r16",
+    'r16b': "/home/vagrant/android-ndk/r16b",
 }
 java_paths = {
     '8': "/usr/lib/jvm/java-8-openjdk-amd64",

diff --git a/buildserver/gradle b/buildserver/gradle
index 6214cc77c06a243f7e2b1bfad88e1154970aad54..fac1dbb45e218e803655e5af1b057bfef9e73afa 100755 (executable)
--- a/buildserver/gradle
+++ b/buildserver/gradle
@@ -26,7 +26,7 @@ d_plugin_k=(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.
 d_plugin_v=(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
-plugin_v=(4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4)
+plugin_v=(4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4)
 
 v_all=${plugin_v[@]}
 echo "Available gradle versions: ${v_all[@]}"

diff --git a/examples/config.py b/examples/config.py
index bd9ebcb234db1b95ead5bca311be05ce0fb05c81..f5b088a6de83b9661dcaedd22c47abb136b2eaa2 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -17,7 +17,7 @@
 #     'r13b': None,
 #     'r14b': None,
 #     'r15c': None,
-#     'r16': None,
+#     'r16b': None,
 # }
 
 # java_paths = {

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 391825e8c93fb1c6c1ebc5f240cf4bb54ddd990f..7f44a4d3d5ebeac1e3ed64cf15165699014a9b71 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -83,7 +83,7 @@ default_config = {
         'r13b': None,
         'r14b': None,
         'r15c': None,
-        'r16': None,
+        'r16b': None,
     },
     'build_tools': MINIMUM_AAPT_VERSION,
     'force_build_tools': False,

diff --git a/makebuildserver b/makebuildserver
index 1f8ad9246e1ad0987b8d2972c98d372f4986c671..20cc386c0f32886897b5c9a2690ce2b9d8d8eb21 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -349,6 +349,8 @@ cachefiles = [
      'e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389'),
     ('https://downloads.gradle.org/distributions/gradle-4.5-bin.zip',
      '03f2a43a314ff0fb843a85ef68078e06d181c4549c1e5fb983f289382b59b5e3'),
+    ('https://downloads.gradle.org/distributions/gradle-4.5.1-bin.zip',
+     '3e2ea0d8b96605b7c528768f646e0975bd9822f06df1f04a64fd279b1a17805e'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
     ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',
@@ -361,8 +363,8 @@ cachefiles = [
      '0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'),
     ('https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip',
      'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'),
-    ('https://dl.google.com/android/repository/android-ndk-r16-linux-x86_64.zip',
-     'a8550b81771c67cc6ab7b479a6918d29aa78de3482901762b4f9e0132cd9672e'),
+    ('https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip',
+     'bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901'),
 ]