Apply some autopep8-python2 suggestions

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 250766ffd4f819b5994d92069909ed404fd56f34..6dc317dcac9888680c7806fe34f86be4bfb3ce50 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -62,9 +62,9 @@ if not os.path.exists(cachedir):
     os.mkdir(cachedir)
 
 cachefiles = [
-    ('android-sdk_r23-linux.tgz',
-     'https://dl.google.com/android/android-sdk_r23-linux.tgz',
-     '2eaab06852ac21b6c79df73c07a667c5da5be57f7ffcbd4f17aef7efeea22ac1'),
+    ('android-sdk_r24.0.1-linux.tgz',
+     'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz',
+     'bb3754524a8f6700c2898617c9d8836a987a8aa43d0e922885cd7a98ca79b281'),
     ('gradle-1.4-bin.zip',
      'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
@@ -89,10 +89,16 @@ 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'),
+    ('gradle-2.2.1-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
+     '420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
     ('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']:
     cachefiles.extend([
@@ -144,12 +150,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'])