Skip to content

Commit bb611b3

Browse files
authored
Merge pull request #158 from ashawley/version-1.1.0
Bump version to 1.1.0
2 parents 3d5846e + 25c7dc3 commit bb611b3

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import ScalaModulePlugin._
22

33
scalaVersionsByJvm in ThisBuild := {
44
val v211 = "2.11.11"
5-
val v212 = "2.12.2"
6-
val v213 = "2.13.0-M1"
5+
val v212 = "2.12.3"
6+
val v213 = "2.13.0-M2"
77
Map(
88
6 -> List(v211 -> true),
99
7 -> List(v211 -> false),
@@ -20,7 +20,7 @@ lazy val xml = crossProject.in(file("."))
2020
.jvmSettings(scalaModuleSettingsJVM)
2121
.settings(
2222
name := "scala-xml",
23-
version := "1.0.7-SNAPSHOT",
23+
version := "1.1.0-SNAPSHOT",
2424

2525
scalacOptions ++= "-deprecation:false -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq],
2626
scalacOptions in Test += "-Xxml:coalescing",
@@ -38,7 +38,7 @@ lazy val xml = crossProject.in(file("."))
3838
import com.typesafe.tools.mima.core.ProblemFilters._
3939
Seq(
4040
// Scala 2.12 deprecated mutable.Stack, so we broke
41-
// binary compatability for 1.0.7 in the following way:
41+
// binary compatibility for 1.1.0 in the following way:
4242
exclude[IncompatibleMethTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack_="),
4343
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.hStack"),
4444
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack"),

project/build.properties

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

project/plugins.sbt

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

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")

shared/src/main/scala/scala/xml/XML.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ object XML extends XMLLoader[Elem] {
7373
* Saves a node to a file with given filename using given encoding
7474
* optionally with xmldecl and doctype declaration.
7575
*
76-
* Note: default encoding was ISO-8859-1 (latin1) in pre-1.0.7 scala-xml versions.
76+
* Note: Before scala-xml 1.1.0, the default encoding was ISO-8859-1 (latin1).
7777
* If your code depends on characters in non-ASCII latin1 range, specify
7878
* ISO-8859-1 encoding explicitly.
7979
*

0 commit comments

Comments
 (0)