From cd7fd9cd80fae104ce29aac51d0d84e2ac463e3b Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Mon, 14 Aug 2017 18:46:45 -0400 Subject: [PATCH 1/4] 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. * From b67695ec6444b79ee313427442c34dff1a9131c3 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Mon, 14 Aug 2017 18:47:51 -0400 Subject: [PATCH 2/4] Increment sbt to 0.13.16 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 64317fdae..c091b86ca 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.16 From e176d3ed5763289ff6aa899f2ef6038c2ae7e9c9 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Thu, 5 Oct 2017 15:55:44 -0400 Subject: [PATCH 3/4] Increment scala compiler to 2.12.3 and 2.13.0-M2 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 55900974b..65b248329 100644 --- a/build.sbt +++ b/build.sbt @@ -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), From 25c7dc3e10648c2faeca1f67861912cd377aa2d6 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Thu, 5 Oct 2017 18:08:09 -0400 Subject: [PATCH 4/4] Update scala-js plugin to 0.6.20 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3a47ab37b..76cc17c5c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")