From 3299873b24c66dba0dd79513daca6dae2aa0f124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 22 Dec 2013 13:22:45 +0100
Subject: [PATCH] Update to gradle 1.9

---
 .../cookbooks/fdroidbuild-general/recipes/default.rb        | 4 ++--
 config.buildserver.py                                       | 2 +-
 config.sample.py                                            | 3 ++-
 makebuildserver.py                                          | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 5c405597..0764eb23 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -23,8 +23,8 @@ script "install-gradle" do
   cwd "/tmp"
   interpreter "bash"
   code "
-    unzip /vagrant/cache/gradle-1.8-bin.zip
-    mv gradle-1.8 /opt/gradle
+    unzip /vagrant/cache/gradle-1.9-bin.zip
+    mv gradle-1.9 /opt/gradle
   "
   not_if "test -d /opt/gradle"
 end
diff --git a/config.buildserver.py b/config.buildserver.py
index 92de94ea..ecdb204a 100644
--- a/config.buildserver.py
+++ b/config.buildserver.py
@@ -3,4 +3,4 @@ ndk_path = "/home/vagrant/android-ndk"
 build_tools = "18.1.1"
 mvn3 = "mvn"
 gradle = "gradle"
-gradle_plugin = "0.6.+"
+gradle_plugin = "0.7.+"
diff --git a/config.sample.py b/config.sample.py
index 0231625b..2da54895 100644
--- a/config.sample.py
+++ b/config.sample.py
@@ -22,7 +22,8 @@ gradle = "gradle"
 # Android gradle plugin version
 # "0.5.+" -> gradle 1.7
 # "0.6.+" -> gradle 1.8
-gradle_plugin = "0.6.+"
+# "0.7.+" -> gradle 1.9
+gradle_plugin = "0.7.+"
 
 # Max height and width (in pixels) for the icons in the repo
 # This corresponds to 72x72 pixels, i.e. mdpi
diff --git a/makebuildserver.py b/makebuildserver.py
index 3ccf239a..e02e05e1 100755
--- a/makebuildserver.py
+++ b/makebuildserver.py
@@ -62,9 +62,9 @@ cachefiles = [
     ('android-sdk_r22.3-linux.tgz',
      'http://dl.google.com/android/android-sdk_r22.3-linux.tgz',
      '4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f'),
-    ('gradle-1.8-bin.zip',
-     'http://services.gradle.org/distributions/gradle-1.8-bin.zip',
-     'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703'),
+    ('gradle-1.9-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.9-bin.zip',
+     '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9'),
     ('Kivy-1.7.2.tar.gz',
      'http://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')