From 98b75387894faa93091c2a36f7a0114a35e02439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 23 Oct 2016 16:47:19 +0100
Subject: [PATCH 1/2] makebs: bump m2repo, add api25 and build-tools 25

---
 makebuildserver | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/makebuildserver b/makebuildserver
index 3bc1f291..4a0e22b1 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -122,8 +122,8 @@ if config['apt_package_cache']:
 cachefiles = [
     ('https://dl.google.com/android/repository/tools_r25.2.2-linux.zip',
      '10d5185af8fee80a7ee093585bf84962d0a877b92a8fef489e2030e910f6a360'),
-    ('https://dl.google.com/android/repository/android_m2repository_r38.zip',
-     '69660df7b98764065242bf283807c06aff42ff689eac561fa6e8f249af60201f'),
+    ('https://dl.google.com/android/repository/android_m2repository_r39.zip',
+     '1feec6fb7cd94a7f804fa8664b517b16fa11c6c851ae592c72bb2f0d24729084'),
     ('https://dl.google.com/android/repository/android-1.5_r04-linux.zip',
      '85b6c8f9797e56aa415d3a282428bb640c96b0acb17c11d41621bb2a5302fe64'),
     ('https://dl.google.com/android/repository/android-1.6_r03-linux.zip',
@@ -168,6 +168,8 @@ cachefiles = [
      '4b4bcddead3319708275c54c76294707bfaa953d767e34f1a5b599f3edd0076c'),
     ('https://dl.google.com/android/repository/platform-24_r02.zip',
      'f268f5945c6ece7ea95c1c252067280854d2a20da924e22ae4720287df8bdbc9'),
+    ('https://dl.google.com/android/repository/platform-25_r01.zip',
+     'da519dc3e07b8cb879265c94f798262c1f90791dfaa8b745d34883891378438e'),
     ('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
     ('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
@@ -220,6 +222,8 @@ cachefiles = [
      '924e29b8a189afbd119d44eae450fc0c9f197ed6f835df223931e45007987d95'),
     ('https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip',
      'f2c02eb1d7e41ce314b5dac50440e7595380c4dd45b41ea1d7b0f86e49516927'),
+    ('https://dl.google.com/android/repository/build-tools_r25-linux.zip',
+     '74eb6931fd7a56859bd8e35d8d73ca8fe7ba6bfd4b7ffe560fe58b7354f2e3aa'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('https://services.gradle.org/distributions/gradle-1.4-bin.zip',

From 148f077ad84577c5b5e5df8c3b68acea58ab7a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 23 Oct 2016 16:58:37 +0100
Subject: [PATCH 2/2] Bump ci images and default build-tools

---
 .gitlab-ci.yml         | 2 +-
 .travis.yml            | 2 +-
 examples/config.py     | 2 +-
 fdroidserver/common.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f992e7a..6a8ae565 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:server-20160909
+image: fdroid/ci:server-20161023
 
 test:
   script:
diff --git a/.travis.yml b/.travis.yml
index 28809377..7694fdad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,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-24.0.2;
+      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-25.0.0;
       elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
       sudo apt-get -q update -y;
diff --git a/examples/config.py b/examples/config.py
index 2e6167cc..63edc718 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -25,7 +25,7 @@
 # }
 
 # Build tools version to be used
-# build_tools = "24.0.2"
+# build_tools = "25.0.0"
 
 # Force all build to use the above version of build -tools, good for testing
 # builds without having all of the possible build-tools installed.
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 51863529..6c5e3faa 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -61,7 +61,7 @@ default_config = {
         'r12b': "$ANDROID_NDK",
     },
     'qt_sdk_path': None,
-    'build_tools': "24.0.2",
+    'build_tools': "25.0.0",
     'force_build_tools': False,
     'java_paths': None,
     'ant': "ant",