raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

build: detect adoptopenjdk java homes (#26337)

Browse source 
The Ubuntu PPA for adoptopenjdk does not strictly follow the Ubuntu Java
naming correctly which can fail the akka build if no other JDK is installed.

rpardini/adoptopenjdk-deb-installer
This commit is contained in:
Johannes Rudolph 2019-02-07 13:39:41 +01:00 • committed by Johan Andrén
parent b3ec17871a
commit 3f929427ef
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project/CrossJava.scala
View file

@ -100,7 +100,7 @@ object CrossJava {
} }
object JavaDiscoverConfig { object JavaDiscoverConfig {
private val JavaHomeDir = """(java-|jdk-?)(1\.)?([0-9]+).*""".r private val JavaHomeDir = """(java-|jdk-?|adoptopenjdk-)(1\.)?([0-9]+).*""".r
class LinuxDiscoverConfig(base: File) extends JavaDiscoverConf { class LinuxDiscoverConfig(base: File) extends JavaDiscoverConf {
def javaHomes: Vector[(String, File)] = def javaHomes: Vector[(String, File)] =