From 3f9ab5e9c15e4bf1fe856e999daceae733f4cd9d Mon Sep 17 00:00:00 2001 From: Philippus Date: Tue, 23 Apr 2019 18:21:43 +0200 Subject: [PATCH 1/3] Import undeprecated crossProject --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2a096192e..3b1f0e104 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,5 @@ -import sbtcrossproject.{crossProject, CrossType} +import sbtcrossproject.CrossType +import sbtcrossproject.CrossPlugin.autoImport.crossProject import ScalaModulePlugin._ crossScalaVersions in ThisBuild := List("2.12.8", "2.13.0-RC1") From 8d6fe784760fa98f703dcd382d552b021c1cd35a Mon Sep 17 00:00:00 2001 From: Philippus Date: Tue, 23 Apr 2019 18:22:18 +0200 Subject: [PATCH 2/3] Replace filter+headOption with find --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3b1f0e104..368da6d0b 100644 --- a/build.sbt +++ b/build.sbt @@ -84,7 +84,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) ) ++ { // http://stackoverflow.com/questions/16934488 Option(System.getProperty("sun.boot.class.path")).flatMap { classPath => - classPath.split(java.io.File.pathSeparator).filter(_.endsWith(java.io.File.separator + "rt.jar")).headOption + classPath.split(java.io.File.pathSeparator).find(_.endsWith(java.io.File.separator + "rt.jar")) }.map { jarPath => Map( file(jarPath) From 74ba82633348e4027bf863aad8763f9eeeff6256 Mon Sep 17 00:00:00 2001 From: Philippus Date: Tue, 23 Apr 2019 18:22:44 +0200 Subject: [PATCH 3/3] Use type-safe scope configuration --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 368da6d0b..a284f9e2d 100644 --- a/build.sbt +++ b/build.sbt @@ -104,10 +104,10 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) .jvmSettings( OsgiKeys.exportPackage := Seq(s"scala.xml.*;version=${version.value}"), - libraryDependencies += "junit" % "junit" % "4.12" % "test", - libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test", - libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.9" % "test", - libraryDependencies += ("org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").exclude("org.scala-lang.modules", s"scala-xml_${scalaBinaryVersion.value}") + libraryDependencies += "junit" % "junit" % "4.12" % Test, + libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test, + libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.9" % Test, + libraryDependencies += ("org.scala-lang" % "scala-compiler" % scalaVersion.value % Test).exclude("org.scala-lang.modules", s"scala-xml_${scalaBinaryVersion.value}") ) .jsSettings( // Scala.js cannot run forked tests