Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand All @@ -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(
Expand All @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.15
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")