Skip to content

Bump version to 1.1.0 #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 5, 2017
Merged

Bump version to 1.1.0 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd7fd9c
Bump version to 1.1.0
ashawley Aug 14, 2017
b67695e
Increment sbt to 0.13.16
ashawley Aug 14, 2017
e176d3e
Increment scala compiler to 2.12.3 and 2.13.0-M2
ashawley Oct 5, 2017
25c7dc3
Update scala-js plugin to 0.6.20
ashawley Oct 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.sbt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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