Add gradle 1.12 for the plugin version 0.10

Also, use https for the gradle.org links

diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
index 8f07827928c74c492200edf20c1511e628c2b9f9..06055e243d3a79afa8aa98afd6b496f071f0fa43 100644 (file)
--- 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}.each do |ver|
+%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12}.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 84ea1a5cef549454186bdcfa820ebf5613ce5993..fb9b3df44a83205f434fd6ff906e9a69af821456 100755 (executable)
--- a/buildserver/cookbooks/gradle/recipes/gradle
+++ b/buildserver/cookbooks/gradle/recipes/gradle
@@ -28,8 +28,8 @@ contains() {
 
 # key-value pairs of what gradle version each gradle plugin version
 # should accept
-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)
+d_plugin_k=(0.10  0.9  0.8 0.7 0.6 0.5 0.4 0.3 0.2)
+d_plugin_v=(1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
 
 for v in ${d_plugin_v}; do
        contains $v "${v_all[*]}" && v_def=$v && break

diff --git a/makebuildserver b/makebuildserver
index a80500f63ff31ed60c4e2e7208f62e67dbc39d30..5b5e4bddac0c47ef9a20757189123fe83c14230d 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -65,26 +65,29 @@ cachefiles = [
      'https://dl.google.com/android/android-sdk_r22.6-linux.tgz',
      'da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f'),
     ('gradle-1.4-bin.zip',
-     'http://services.gradle.org/distributions/gradle-1.4-bin.zip',
+     'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
     ('gradle-1.6-bin.zip',
-     'http://services.gradle.org/distributions/gradle-1.6-bin.zip',
+     'https://services.gradle.org/distributions/gradle-1.6-bin.zip',
      'de3e89d2113923dcc2e0def62d69be0947ceac910abd38b75ec333230183fac4'),
     ('gradle-1.7-bin.zip',
-     'http://services.gradle.org/distributions/gradle-1.7-bin.zip',
+     'https://services.gradle.org/distributions/gradle-1.7-bin.zip',
      '360c97d51621b5a1ecf66748c718594e5f790ae4fbc1499543e0c006033c9d30'),
     ('gradle-1.8-bin.zip',
-     'http://services.gradle.org/distributions/gradle-1.8-bin.zip',
+     'https://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',
+     'https://services.gradle.org/distributions/gradle-1.9-bin.zip',
      '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9'),
     ('gradle-1.10-bin.zip',
-     'http://services.gradle.org/distributions/gradle-1.10-bin.zip',
+     'https://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',
+     'https://services.gradle.org/distributions/gradle-1.11-bin.zip',
      '07e235df824964f0e19e73ea2327ce345c44bcd06d44a0123d29ab287fc34091'),
+    ('gradle-1.12-bin.zip',
+     'https://services.gradle.org/distributions/gradle-1.12-bin.zip',
+     '8734b13a401f4311ee418173ed6ca8662d2b0a535be8ff2a43ecb1c13cd406ea'),
     ('Kivy-1.7.2.tar.gz',
      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')