Skip to content

Commit

Permalink
Merge pull request #158 from ashawley/version-1.1.0
Browse files Browse the repository at this point in the history
Bump version to 1.1.0
  • Loading branch information
ashawley authored Oct 5, 2017
2 parents 3d5846e + 25c7dc3 commit bb611b3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import ScalaModulePlugin._

scalaVersionsByJvm in ThisBuild := {
val v211 = "2.11.11"
val v212 = "2.12.2"
val v213 = "2.13.0-M1"
val v212 = "2.12.3"
val v213 = "2.13.0-M2"
Map(
6 -> List(v211 -> true),
7 -> List(v211 -> false),
Expand All @@ -20,7 +20,7 @@ lazy val xml = crossProject.in(file("."))
.jvmSettings(scalaModuleSettingsJVM)
.settings(
name := "scala-xml",
version := "1.0.7-SNAPSHOT",
version := "1.1.0-SNAPSHOT",

scalacOptions ++= "-deprecation:false -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq],
scalacOptions in Test += "-Xxml:coalescing",
Expand All @@ -38,7 +38,7 @@ lazy val xml = crossProject.in(file("."))
import com.typesafe.tools.mima.core.ProblemFilters._
Seq(
// Scala 2.12 deprecated mutable.Stack, so we broke
// binary compatability for 1.0.7 in the following way:
// binary compatibility for 1.1.0 in the following way:
exclude[IncompatibleMethTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack_="),
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.hStack"),
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack"),
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.15
sbt.version=0.13.16
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" % "sbt-scala-module" % "1.0.12")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")
2 changes: 1 addition & 1 deletion shared/src/main/scala/scala/xml/XML.scala
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object XML extends XMLLoader[Elem] {
* Saves a node to a file with given filename using given encoding
* optionally with xmldecl and doctype declaration.
*
* Note: default encoding was ISO-8859-1 (latin1) in pre-1.0.7 scala-xml versions.
* Note: Before scala-xml 1.1.0, the default encoding was ISO-8859-1 (latin1).
* If your code depends on characters in non-ASCII latin1 range, specify
* ISO-8859-1 encoding explicitly.
*
Expand Down

0 comments on commit bb611b3

Please sign in to comment.