From 393b216c290cc6a8269afaf7f95f7ade9f56777e Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Mon, 23 Oct 2017 11:00:07 -0400 Subject: [PATCH 1/5] Add Java 9 to Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9fce93b77..57da53855 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ addons: jdk: - openjdk6 - oraclejdk8 + - oraclejdk9 notifications: email: adriaan.moors@lightbend.com From 00d920f5c510555a1179543fd990e6b28f23d97d Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 24 Dec 2017 18:01:15 +0900 Subject: [PATCH 2/5] Fix sbtApiMappings for Java 9 --- build.sbt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 2cacdc18f..bdc8d5399 100644 --- a/build.sbt +++ b/build.sbt @@ -27,11 +27,18 @@ lazy val xml = crossProject.in(file(".")) apiMappings ++= Map( scalaInstance.value.libraryJar - -> url(s"http://www.scala-lang.org/api/${scalaVersion.value}/"), + -> url(s"http://www.scala-lang.org/api/${scalaVersion.value}/") + ) ++ { // http://stackoverflow.com/questions/16934488 - file(System.getProperty("sun.boot.class.path").split(java.io.File.pathSeparator).filter(_.endsWith(java.io.File.separator + "rt.jar")).head) - -> url("http://docs.oracle.com/javase/8/docs/api") - ) + Option(System.getProperty("sun.boot.class.path")).flatMap { classPath => + classPath.split(java.io.File.pathSeparator).filter(_.endsWith(java.io.File.separator + "rt.jar")).headOption + }.map { jarPath => + Map( + file(jarPath) + -> url("http://docs.oracle.com/javase/8/docs/api") + ) + } getOrElse(Map.empty) + } ) .jvmSettings( OsgiKeys.exportPackage := Seq(s"scala.xml.*;version=${version.value}"), From c155532c80dc164d93bbc2e77b1557d0a960244d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Wed, 10 Jan 2018 08:47:56 -0500 Subject: [PATCH 3/5] Fix apiMappings for JDK9 with jrt: hack Based on scala-js/scala-js@98973d4 --- build.sbt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index bdc8d5399..dd2cfc0b4 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,13 @@ lazy val xml = crossProject.in(file(".")) file(jarPath) -> url("http://docs.oracle.com/javase/8/docs/api") ) - } getOrElse(Map.empty) + } getOrElse { + // If everything fails, jam in the Java 9 base module. + Map( + file("/modules/java.base") + -> url("http://docs.oracle.com/javase/9/docs/api") + ) + } } ) .jvmSettings( From 41e3c1c2454c54757230fd779ab328731f85a5c7 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Wed, 10 Jan 2018 08:49:00 -0500 Subject: [PATCH 4/5] Add java.xml module to apiMappings for Java 9 --- build.sbt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sbt b/build.sbt index dd2cfc0b4..629f66247 100644 --- a/build.sbt +++ b/build.sbt @@ -41,7 +41,10 @@ lazy val xml = crossProject.in(file(".")) // If everything fails, jam in the Java 9 base module. Map( file("/modules/java.base") + -> url("http://docs.oracle.com/javase/9/docs/api"), + file("/modules/java.xml") -> url("http://docs.oracle.com/javase/9/docs/api") + ) } } From 598fe78e28fa0cb6acf27a32dada8b3477734d19 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Wed, 31 Jan 2018 15:10:24 -0500 Subject: [PATCH 5/5] Increment sbt to 0.13.17 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c091b86ca..133a8f197 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 +sbt.version=0.13.17