diff --git a/build.sbt b/build.sbt index 81a9abcad..64b76fdd4 100644 --- a/build.sbt +++ b/build.sbt @@ -4,9 +4,9 @@ scalaVersion in ThisBuild := crossScalaVersions.value.head crossScalaVersions in ThisBuild := { val java = System.getProperty("java.version") if (java.startsWith("1.6.") || java.startsWith("1.7.")) - Seq("2.11.8") + Seq("2.11.11") else if (java.startsWith("1.8.") || java.startsWith("1.9.")) - Seq("2.12.1") + Seq("2.12.2") else sys.error(s"don't know what Scala versions to build on $java") } @@ -18,7 +18,7 @@ lazy val root = project.in(file(".")) lazy val xml = crossProject.in(file(".")) .settings( name := "scala-xml", - version := "1.0.6-SNAPSHOT", + version := "1.0.7-SNAPSHOT", scalacOptions ++= "-deprecation:false -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq], scalacOptions in Test += "-Xxml:coalescing") .jvmSettings( @@ -29,7 +29,7 @@ lazy val xml = crossProject.in(file(".")) libraryDependencies += "junit" % "junit" % "4.11" % "test", libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test", libraryDependencies += ("org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").exclude("org.scala-lang.modules", s"scala-xml*"), - mimaPreviousVersion := Some("1.0.5"), + mimaPreviousVersion := Some("1.0.6"), // You cannot disable JVM test forking when working on scala modules // that are distributed with the compiler because of an SBT // classloader leaking issue (scala/scala-xml#20 and #112). diff --git a/project/build.properties b/project/build.properties index 27e88aa11..64317fdae 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=0.13.15 diff --git a/project/plugins.sbt b/project/plugins.sbt index 03dbd0511..869efcd35 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15")