all: switch to jdk8 as default

Also, remove jdk7 as it will become unused. We added jdk8 for
retrolambda, and now that we will use jdk8 as the default, jdk7 is
unnecessary as retrolambda can work fine with just jdk8.

This removes it from the buildserver, and the new CI image also only has
jdk8 from jessie-backports.

Fixes #185.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef1e2fbe6e6b11177f9ff539651d867da057a81a..d0125d240a1cc94c50a7ad69923db297dac5de00 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:server-20160613
+image: mvdan/fdroid-ci:server-20160621
 
 test:
   script:

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index b14d6869290085bc5b7723786b633bd15854e519..50976dbe9ba8302061593451c6e3b312072e9b69 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -4,6 +4,5 @@ ndk_paths = {
     'r10e': "/home/vagrant/android-ndk/r10e",
 }
 java_paths = {
-    '7': "/usr/lib/jvm/java-7-openjdk-i386",
     '8': "/usr/lib/jvm/java-8-openjdk-i386",
 }

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index f9f81fe08aca96c5744ff4f17e6dda8db8e86592..119c19e54a7619e537ea40414ec809af9f38e9af 100644 (file)
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -51,8 +51,7 @@ end
     maven
     mercurial
     nasm
-    openjdk-7-jdk
-    openjdk-8-jdk
+    openjdk-8-jdk-headless
     optipng
     p7zip
     pandoc
@@ -98,7 +97,7 @@ easy_install_package "compare-locales" do
 end
 
 execute "set-default-java" do
-  command "update-java-alternatives --set java-1.7.0-openjdk-i386"
+  command "update-java-alternatives --set java-1.8.0-openjdk-i386"
 end
 
 # Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings

diff --git a/examples/config.py b/examples/config.py
index 1a3367e86a9fc2c24e1366ea941e899c4ca78aa3..5ae2983f8eedaa51e7327e69167487311b58315f 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -15,11 +15,8 @@
 #     'r10e': "$ANDROID_NDK",
 # }
 
-# If you want to build apps that use retrolambda and Java 1.8, you'll need to
-# have both 1.7 and 1.8 installed.
 # java_paths = {
-#     '1.7': "/usr/lib/jvm/java-7-openjdk",
-#     '1.8': None,
+#     '1.8': "/usr/lib/jvm/java-8-openjdk",
 # }
 
 # Build tools version to be used

diff --git a/tests/complete-ci-tests b/tests/complete-ci-tests
index e30d990a3880d920e0260667d5d095f9df616441..9f7e146f1455c92bd9cd837c2f284d2ecaf4a343 100755 (executable)
--- a/tests/complete-ci-tests
+++ b/tests/complete-ci-tests
@@ -36,9 +36,9 @@ fi
 
 
 #------------------------------------------------------------------------------#
-# required Java 7 keytool/jarsigner for :file support
+# required Java 7 or later keytool/jarsigner for :file support
 
-export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH
+export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH
 
 
 #------------------------------------------------------------------------------#