Merge branch 'update-vagrantfile' into 'master'

Update Vagrantfile and docs to clarify v1.4.3 is ok

Saw in the server docs that we were recommending 1.3.x and saying 1.4.x was broken. I've confirmed that 1.4.x works, and updated things accordingly. Higher version might work, but figured minimal change to build stuff was best :)

See merge request !24

diff --combined docs/fdroid.texi
index 8dd4078d61a174d4368df61d2e46db9ecc830ef3,c25fc1a106b814f3510e0718ae1b4d979d7aa137..c57689c7e0903f62f485347dd34b40aa8857895f
--- 1/docs/fdroid.texi
--- 2/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@@ -113,8 -113,7 +113,7 @@@ VirtualBox (debian package virtualbox
  @item
  Ruby (debian packages ruby and rubygems)
  @item
- Vagrant (unpackaged) Be sure to use 1.3.x because 1.4.x is completely broken
- (at the time of writing, the forthcoming 1.4.3 might work)
+ Vagrant (unpackaged, tested on v1.4.3)
  @item
  Paramiko (debian package python-paramiko)
  @item
@@@ -886,7 -885,7 +885,7 @@@ which architecture or platform the apk 
  If specified, the package version code in the AndroidManifest.xml is
  replaced with the version code for the build. See also forceversion.
  
 -@item rm=relpath1,relpath2,...
 +@item rm=<path1>[,<path2>,...]
  Specifies the relative paths of files or directories to delete before
  the build is done. The paths are relative to the base of the build
  directory - i.e. the root of the directory structure checked out from
@@@ -896,7 -895,7 +895,7 @@@ AndroidManifest.xml
  Multiple files/directories can be specified by separating them with ','.
  Directories will be recursively deleted.
  
 -@item extlibs=a,b,...
 +@item extlibs=<lib1>[,<lib2>,...]
  Comma-separated list of external libraries (jar files) from the
  @code{build/extlib} library, which will be placed in the @code{libs} directory
  of the project.
@@@ -949,7 -948,7 +948,7 @@@ You can use $$SDK$$, $$NDK$$ and $$MVN3
  android SDK and NDK directories, and Maven 3 executable respectively e.g.
  for when you need to run @code{android update project} explicitly.
  
 -@item scanignore=path1,path2,...
 +@item scanignore=<path1>[,<path2>,...]
  Enables one or more files/paths to be excluded from the scan process.
  This should only be used where there is a very good reason, and
  probably accompanied by a comment explaining why it is necessary.
@@@ -957,7 -956,7 +956,7 @@@
  When scanning the source tree for problems, matching files whose relative
  paths start with any of the paths given here are ignored.
  
 -@item scandelete=path1,path2,...
 +@item scandelete=<path1>[,<path2>,...]
  Similar to scanignore=, but instead of ignoring files under the given paths,
  it tells f-droid to delete the matching files directly.
  
@@@ -989,25 -988,23 +988,25 @@@ actually not required or used, remove t
  isn't used nor built will result in an error saying that native
  libraries were expected in the resulting package.
  
 -@item gradle=<flavour>
 -Build with Gradle instead of Ant, specifying what flavour to assemble.
 -If <flavour> is 'yes' or 'main', no flavour will be used. Note
 -that this will not work on projects with flavours, since it will build
 -all flavours and there will be no 'main' build.
 +@item gradle=<flavour1>[,<flavour2>,...]
 +Build with Gradle instead of Ant, specifying what flavours to use. Flavours
 +are case sensitive since the path to the output apk is as well.
 +
 +If only one flavour is given and it is 'yes' or 'main', no flavour will be
 +used. Note that for projects with flavours, you must specify at least one
 +valid flavour since 'yes' or 'main' will build all of them separately.
  
  @item maven=yes[@@<dir>]
  Build with Maven instead of Ant. An extra @@<dir> tells f-droid to run Maven
  inside that relative subdirectory. Sometimes it is needed to use @@.. so that
  builds happen correctly.
  
 -@item preassemble=<task1> <task2>
 -Space-separated list of Gradle tasks to be run before the assemble task
 -in a Gradle project build.
 +@item preassemble=<task1>[,<task2>,...]
 +List of Gradle tasks to be run before the assemble task in a Gradle project
 +build.
  
 -@item antcommand=xxx
 -Specify an alternate Ant command (target) instead of the default
 +@item antcommands=<target1>[,<target2>,...]
 +Specify an alternate set of Ant commands (target) instead of the default
  'release'. It can't be given any flags, such as the path to a build.xml.
  
  @item output=path/to/output.apk

diff --combined makebuildserver
index 379001c80bd2b680744581c7f3f974e8182dd3d6,44efef29a5e2fd12de3ffc2d3e0c0be735276795..2f67f345942f2fff538bce55d558dc5c73ba2d0d
--- 1/makebuildserver
--- 2/makebuildserver
+++ b/makebuildserver
@@@ -89,12 -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']:
@@@ -147,12 -144,14 +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'])