Merge branch 'update-vagrantfile' into 'master'

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 7bf0e14d89db4bfa28b6b70c30f34126e4b5ae54..2f67f345942f2fff538bce55d558dc5c73ba2d0d 100755 (executable)
--- 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']:
@@ -144,12 +147,14 @@ for f, src, shasum in cachefiles:
 # Generate an appropriate Vagrantfile for the buildserver, based on our
 # settings...
 vagrantfile = """
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
 
   config.vm.box = "{0}"
   config.vm.box_url = "{1}"
 
-  config.vm.customize ["modifyvm", :id, "--memory", "{2}"]
+  config.vm.provider "virtualbox" do |v|
+    v.customize ["modifyvm", :id, "--memory", "{2}"]
+  end
 
   config.vm.provision :shell, :path => "fixpaths.sh"
 """.format(config['basebox'], config['baseboxurl'], config['memory'])