Skip to content

Commit da81d89

Browse files
authored
Merge pull request scala#141 from ashawley/version-1.0.7
Bump version to 1.0.7
2 parents 2ee8750 + 983e453 commit da81d89

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ scalaVersion in ThisBuild := crossScalaVersions.value.head
44
crossScalaVersions in ThisBuild := {
55
val java = System.getProperty("java.version")
66
if (java.startsWith("1.6.") || java.startsWith("1.7."))
7-
Seq("2.11.8")
7+
Seq("2.11.11")
88
else if (java.startsWith("1.8.") || java.startsWith("1.9."))
9-
Seq("2.12.1")
9+
Seq("2.12.2")
1010
else
1111
sys.error(s"don't know what Scala versions to build on $java")
1212
}
@@ -18,7 +18,7 @@ lazy val root = project.in(file("."))
1818
lazy val xml = crossProject.in(file("."))
1919
.settings(
2020
name := "scala-xml",
21-
version := "1.0.6-SNAPSHOT",
21+
version := "1.0.7-SNAPSHOT",
2222
scalacOptions ++= "-deprecation:false -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq],
2323
scalacOptions in Test += "-Xxml:coalescing")
2424
.jvmSettings(
@@ -29,7 +29,7 @@ lazy val xml = crossProject.in(file("."))
2929
libraryDependencies += "junit" % "junit" % "4.11" % "test",
3030
libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test",
3131
libraryDependencies += ("org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").exclude("org.scala-lang.modules", s"scala-xml*"),
32-
mimaPreviousVersion := Some("1.0.5"),
32+
mimaPreviousVersion := Some("1.0.6"),
3333
// You cannot disable JVM test forking when working on scala modules
3434
// that are distributed with the compiler because of an SBT
3535
// classloader leaking issue (scala/scala-xml#20 and #112).

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=0.13.15

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4")
22

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15")

0 commit comments

Comments
 (0)