From c76d2321f3f2957060ac72f867a090c0c84e09b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 7 Mar 2014 15:21:18 +0100 Subject: [PATCH] Add support for gradle 1.11 (and plugin ver 0.9) --- buildserver/cookbooks/gradle/recipes/default.rb | 2 +- buildserver/cookbooks/gradle/recipes/gradle | 4 ++-- makebuildserver | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb index 137e8d8c..8f078279 100644 --- a/buildserver/cookbooks/gradle/recipes/default.rb +++ b/buildserver/cookbooks/gradle/recipes/default.rb @@ -18,7 +18,7 @@ script "add-gradle-verdir" do not_if "test -d /opt/gradle/versions" end -%w{1.4 1.6 1.7 1.8 1.9 1.10}.each do |ver| +%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11}.each do |ver| script "install-gradle-#{ver}" do cwd "/tmp" interpreter "bash" diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle index 2d759591..71cf7bff 100755 --- a/buildserver/cookbooks/gradle/recipes/gradle +++ b/buildserver/cookbooks/gradle/recipes/gradle @@ -21,8 +21,8 @@ run_gradle() { # key-value pairs of what gradle version each gradle plugin version # should accept -d_plugin_k=( 0.8 0.7 0.6 0.5 0.4 0.3 0.2) -d_plugin_v=(1.10 1.9 1.8 1.6 1.6 1.4 1.4) +d_plugin_k=( 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2) +d_plugin_v=(1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4) # Latest takes priority files=(../build.gradle build.gradle) diff --git a/makebuildserver b/makebuildserver index d4fde838..db8e00aa 100755 --- a/makebuildserver +++ b/makebuildserver @@ -81,6 +81,9 @@ cachefiles = [ ('gradle-1.10-bin.zip', 'http://services.gradle.org/distributions/gradle-1.10-bin.zip', '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'), + ('gradle-1.11-bin.zip', + 'http://services.gradle.org/distributions/gradle-1.11-bin.zip', + '07e235df824964f0e19e73ea2327ce345c44bcd06d44a0123d29ab287fc34091'), ('Kivy-1.7.2.tar.gz', 'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz', '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')