Merge branch 'ci-update' into 'master'

Gradle 2.12, build-tools 23.0.3

See merge request !117

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4ef1297989640188434b48919b7e2f57c6bab21..c585e7dedf50424bf29f19ed05b7f76c9db27725 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:base-20160329
+image: mvdan/fdroid-ci:base-20160405
 
 test:
   script:

diff --git a/.travis.yml b/.travis.yml
index 8fe558745cded8daa60328bd665c22764c885d1c..f0b25ad117652681819010755cc9c2268ecd2b41 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ install:
       sudo pip3 install pep8 pyflakes pylint;
       sudo pip3 install -e  .;
       sudo rm -rf fdroidserver.egg-info;
-      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-23.0.2;
+      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-23.0.3;
       elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
       sudo apt-get -q update -y;

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 98aa4dc39282eb7aad0b1a492f9901aac73d9c96..7e76930b8289b985e9376e22a81b467646a32875 100644 (file)
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -62,7 +62,7 @@ end
 
 %w{17.0.0 18.0.1 18.1.0 18.1.1 19.0.0 19.0.1 19.0.2 19.0.3 19.1.0
     20.0.0 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1 21.1.2 22.0.0 22.0.1
-    23.0.0 23.0.1 23.0.2
+    23.0.0 23.0.1 23.0.2 23.0.3
 }.each do |ver|
   script "add_btools_#{ver}" do
     interpreter "bash"

diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle
index 4e0c361ed73f3be262ba29321964eb94f8fa3ab2..b43488d5b54f2ccc6cc95c72258bb020a5b4fadc 100755 (executable)
--- a/buildserver/cookbooks/gradle/recipes/gradle
+++ b/buildserver/cookbooks/gradle/recipes/gradle
@@ -23,11 +23,11 @@ contains() {
 
 # key-value pairs of what gradle version each gradle plugin version
 # should accept
-d_plugin_k=(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_plugin_v=(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)
+d_plugin_k=( 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_plugin_v=(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=(2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4)
+plugin_v=(2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4)
 
 # Find the highest version available
 for v in ${plugin_v[*]}; do

diff --git a/examples/config.py b/examples/config.py
index f022c2b0a76010aa5992eb0b1f444d2de671b888..56ed7b86cd3c4172da07c5c9316a97bc5a771a06 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -23,7 +23,7 @@
 # }
 
 # Build tools version to be used
-# build_tools = "23.0.2"
+# build_tools = "23.0.3"
 
 # Command or path to binary for running Ant
 # ant = "ant"

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 67ef0c087a3436bba46975b165ef902f0b4ed656..8693764073d25919466e00bca3e47080a6aa4086 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -58,7 +58,7 @@ default_config = {
         'r9b': None,
         'r10e': "$ANDROID_NDK",
     },
-    'build_tools': "23.0.2",
+    'build_tools': "23.0.3",
     'java_paths': None,
     'ant': "ant",
     'mvn3': "mvn",

diff --git a/makebuildserver b/makebuildserver
index 18df612396ff9d898995742944aad29f185cdd4e..1fa18343d8f3982eec20dc18a68974b1d7538f74 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -214,6 +214,9 @@ cachefiles = [
     ('build-tools-23.0.2.zip',
      'https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip',
      '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
+    ('build-tools-23.0.3.zip',
+     'https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip',
+     'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('gradle-1.4-bin.zip',
@@ -273,6 +276,9 @@ cachefiles = [
     ('gradle-2.11-bin.zip',
      'https://services.gradle.org/distributions/gradle-2.11-bin.zip',
      '8d7437082356c9fd6309a4479c8db307673965546daea445c6c72759cd6b1ed6'),
+    ('gradle-2.12-bin.zip',
+     'https://services.gradle.org/distributions/gradle-1.12-bin.zip',
+     'e77064981906cd0476ff1e0de3e6fef747bd18e140960f1915cca8ff6c33ab5c'),
     ('Kivy-1.7.2.tar.gz',
      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),