From cd7fd9cd80fae104ce29aac51d0d84e2ac463e3b Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Mon, 14 Aug 2017 18:46:45 -0400 Subject: [PATCH] Bump version to 1.1.0 - build.sbt - improve UTF-8 doc note --- build.sbt | 4 ++-- shared/src/main/scala/scala/xml/XML.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 097f8600d..55900974b 100644 --- a/build.sbt +++ b/build.sbt @@ -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", @@ -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"), diff --git a/shared/src/main/scala/scala/xml/XML.scala b/shared/src/main/scala/scala/xml/XML.scala index be1de76a5..96df9c513 100755 --- a/shared/src/main/scala/scala/xml/XML.scala +++ b/shared/src/main/scala/scala/xml/XML.scala @@ -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. *