mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
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.
This commit is contained in:
parent
d11135b441
commit
5de678e48b
@ -1,4 +1,4 @@
|
|||||||
image: mvdan/fdroid-ci:server-20160613
|
image: mvdan/fdroid-ci:server-20160621
|
||||||
|
|
||||||
test:
|
test:
|
||||||
script:
|
script:
|
||||||
|
@ -4,6 +4,5 @@ ndk_paths = {
|
|||||||
'r10e': "/home/vagrant/android-ndk/r10e",
|
'r10e': "/home/vagrant/android-ndk/r10e",
|
||||||
}
|
}
|
||||||
java_paths = {
|
java_paths = {
|
||||||
'7': "/usr/lib/jvm/java-7-openjdk-i386",
|
|
||||||
'8': "/usr/lib/jvm/java-8-openjdk-i386",
|
'8': "/usr/lib/jvm/java-8-openjdk-i386",
|
||||||
}
|
}
|
||||||
|
@ -51,8 +51,7 @@ end
|
|||||||
maven
|
maven
|
||||||
mercurial
|
mercurial
|
||||||
nasm
|
nasm
|
||||||
openjdk-7-jdk
|
openjdk-8-jdk-headless
|
||||||
openjdk-8-jdk
|
|
||||||
optipng
|
optipng
|
||||||
p7zip
|
p7zip
|
||||||
pandoc
|
pandoc
|
||||||
@ -98,7 +97,7 @@ easy_install_package "compare-locales" do
|
|||||||
end
|
end
|
||||||
|
|
||||||
execute "set-default-java" do
|
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
|
end
|
||||||
|
|
||||||
# Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings
|
# Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings
|
||||||
|
@ -15,11 +15,8 @@
|
|||||||
# 'r10e': "$ANDROID_NDK",
|
# '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 = {
|
# java_paths = {
|
||||||
# '1.7': "/usr/lib/jvm/java-7-openjdk",
|
# '1.8': "/usr/lib/jvm/java-8-openjdk",
|
||||||
# '1.8': None,
|
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Build tools version to be used
|
# Build tools version to be used
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------#
|
#------------------------------------------------------------------------------#
|
||||||
|
Loading…
Reference in New Issue
Block a user