From 135e15bde326de38955416ce9d763ed2d502d1af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 7 Oct 2014 16:36:10 +0200 Subject: [PATCH] Add support for gradle plugin version 0.13 via gradle 2.1 --- buildserver/cookbooks/gradle/recipes/gradle | 4 ++-- makebuildserver | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle index 89169b24..7562ad0c 100755 --- a/buildserver/cookbooks/gradle/recipes/gradle +++ b/buildserver/cookbooks/gradle/recipes/gradle @@ -23,8 +23,8 @@ contains() { # key-value pairs of what gradle version each gradle plugin version # should accept -d_plugin_k=(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=(1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4) +d_plugin_k=(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.1 1.12 1.12 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 7bf0e14d..379001c8 100755 --- a/makebuildserver +++ b/makebuildserver @@ -89,9 +89,12 @@ cachefiles = [ ('gradle-1.12-bin.zip', 'https://services.gradle.org/distributions/gradle-1.12-bin.zip', '8734b13a401f4311ee418173ed6ca8662d2b0a535be8ff2a43ecb1c13cd406ea'), + ('gradle-2.1-bin.zip', + 'https://services.gradle.org/distributions/gradle-2.1-bin.zip', + '3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878'), ('Kivy-1.7.2.tar.gz', 'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz', - '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1') + '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'), ] if config['arch64']: -- 2.30.2