From e6cad14ba855273949ed1f0015609a5257ef5d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 22 Oct 2019 14:30:30 +0200 Subject: [PATCH] Add support for Java 11. (#16) --- .travis.yml | 1 + .../ch/epfl/scala/sbtmissinglink/MissingLinkPlugin.scala | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22d4d97..9a4a3ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ script: jdk: - openjdk8 + - openjdk11 cache: directories: diff --git a/src/main/scala/ch/epfl/scala/sbtmissinglink/MissingLinkPlugin.scala b/src/main/scala/ch/epfl/scala/sbtmissinglink/MissingLinkPlugin.scala index e8a338d..c64ce6f 100644 --- a/src/main/scala/ch/epfl/scala/sbtmissinglink/MissingLinkPlugin.scala +++ b/src/main/scala/ch/epfl/scala/sbtmissinglink/MissingLinkPlugin.scala @@ -8,7 +8,7 @@ import java.io.FileInputStream import scala.collection.JavaConverters._ -import com.spotify.missinglink.{ArtifactLoader, Conflict, ConflictChecker} +import com.spotify.missinglink.{ArtifactLoader, Conflict, ConflictChecker, Java9ModuleLoader} import com.spotify.missinglink.Conflict.ConflictCategory import com.spotify.missinglink.datamodel.{ Artifact, @@ -106,8 +106,7 @@ object MissingLinkPlugin extends AutoPlugin { private def loadBootstrapArtifacts(bootstrapClasspath: String, log: Logger): List[Artifact] = { if (bootstrapClasspath == null) { - ??? - //Java9ModuleLoader.getJava9ModuleArtifacts((s, ex) => log.warn(s)) + Java9ModuleLoader.getJava9ModuleArtifacts((s, ex) => log.warn(s)).asScala.toList } else { constructArtifacts( bootstrapClasspath.split(System.getProperty("path.separator")).map(file(_)),