From bf0e5dde71c3ef157340caac386dcf0d18eaf245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 14 Apr 2016 16:16:58 +0100
Subject: [PATCH 1/2] CI: Install venv instead of virtualenv

---
 .gitlab-ci.yml | 2 +-
 .travis.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c585e7de..1a6f37aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:base-20160405
+image: mvdan/fdroid-ci:base-20160414
 
 test:
   script:
diff --git a/.travis.yml b/.travis.yml
index f0b25ad1..abdf6d3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ install:
       sudo apt-get -q install -y --no-install-recommends python3 python3-dev
       python3-git python3-pil python3-libcloud python3-logilab-astng
       python3-paramiko python3-pip python3-pyasn1 python3-pyasn1-modules
-      python3-requests python3-virtualenv python3-yaml rsync
+      python3-requests python3-venv python3-yaml rsync
       pyflakes pylint3 pep8 dash bash ruby libjpeg-dev zlib1g-dev;
       sudo pip3 install pylint;
       fi

From 8dea6b896ce38e488c082eb60e274065712b3b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 14 Apr 2016 16:19:35 +0100
Subject: [PATCH 2/2] gradle: forgot to actually install 2.12

---
 buildserver/cookbooks/gradle/recipes/default.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildserver/cookbooks/gradle/recipes/default.rb b/buildserver/cookbooks/gradle/recipes/default.rb
index b2a8be35..9fd95fe1 100644
--- 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 1.12 2.1 2.2.1 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11}.each do |ver|
+%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 2.1 2.2.1 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11 2.12}.each do |ver|
   script "install-gradle-#{ver}" do
     cwd "/tmp"
     interpreter "bash"