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

Ignore vendor when selecting JVMs #25835

Browse source
This commit is contained in:
Johan Andrén 2018-10-30 10:51:30 +01:00 • committed by GitHub
parent fafc59b19d
commit 6329a7b77e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrependSpec.scala
View file

@ -1,4 +1,4 @@
/** /*
* Copyright (C) 2016-2018 Lightbend Inc. <https://www.lightbend.com> * Copyright (C) 2016-2018 Lightbend Inc. <https://www.lightbend.com>
*/ */

4
project/CrossJava.scala
View file

@ -135,8 +135,8 @@ object CrossJava {
def javaHomes: Vector[(String, File)] = def javaHomes: Vector[(String, File)] =
wrapNull(base.list()) wrapNull(base.list())
.collect { .collect {
case dir@JavaHomeDir(vendor, m, n) => case dir@JavaHomeDir(_, m, n) =>
val v = JavaVersion(nullBlank(m) + n).withVendor(vendor).toString val v = JavaVersion(nullBlank(m) + n).toString
if ((base / dir / "Contents" / "Home").exists) v -> (base / dir / "Contents" / "Home") if ((base / dir / "Contents" / "Home").exists) v -> (base / dir / "Contents" / "Home")
else v -> (base / dir) else v -> (base / dir)
} }