diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb index 0a5fa146..2a329135 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 1.11 1.12 2.1 2.2.1 2.3 2.4}.each do |ver| +%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 2.1 2.2.1 2.3 2.4 2.5}.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 58bc6e11..1d20be79 100755 --- a/buildserver/cookbooks/gradle/recipes/gradle +++ b/buildserver/cookbooks/gradle/recipes/gradle @@ -26,8 +26,11 @@ contains() { d_plugin_k=(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.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.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 ${d_plugin_v}; do +for v in ${plugin_v}; do if contains $v "${v_all[*]}"; then v_def=$v break diff --git a/makebuildserver b/makebuildserver index 6ae0ec96..1a7f2475 100755 --- a/makebuildserver +++ b/makebuildserver @@ -101,6 +101,9 @@ cachefiles = [ ('gradle-2.4-bin.zip', 'https://services.gradle.org/distributions/gradle-2.4-bin.zip', 'c4eaecc621a81f567ded1aede4a5ddb281cc02a03a6a87c4f5502add8fc2f16f'), + ('gradle-2.5-bin.zip', + 'https://services.gradle.org/distributions/gradle-2.5-bin.zip', + '3f953e0cb14bb3f9ebbe11946e84071547bf5dfd575d90cfe9cc4e788da38555'), ('Kivy-1.7.2.tar.gz', 'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz', '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),