From cf34171810e020fdf63bd3b942329285e43d28dd Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Thu, 4 Apr 2019 12:33:10 -0400 Subject: [PATCH 1/2] Use 2.13.0-RC1 release candidate --- .travis.yml | 4 ++-- build.sbt | 2 +- .../scala-2.11-2.12/scala/xml/ScalaVersionSpecific.scala | 4 ---- .../src/main/scala-2.13/scala/xml/ScalaVersionSpecific.scala | 5 +---- shared/src/main/scala/scala/xml/MetaData.scala | 1 - shared/src/main/scala/scala/xml/NodeSeq.scala | 2 +- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index b279ac34f..4b4884d9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ jdk: scala: - 2.11.12 - 2.12.8 - - 2.13.0-M5 + - 2.13.0-RC1 env: global: @@ -46,7 +46,7 @@ matrix: jdk: openjdk11 - scala: 2.12.8 jdk: openjdk6 - - scala: 2.13.0-M5 + - scala: 2.13.0-RC1 jdk: openjdk6 before_script: diff --git a/build.sbt b/build.sbt index 14a058f69..eccab34b6 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import sbtcrossproject.{crossProject, CrossType} import ScalaModulePlugin._ -crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-M5") +crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC1") lazy val xml = crossProject(JSPlatform, JVMPlatform) .withoutSuffixFor(JVMPlatform) diff --git a/shared/src/main/scala-2.11-2.12/scala/xml/ScalaVersionSpecific.scala b/shared/src/main/scala-2.11-2.12/scala/xml/ScalaVersionSpecific.scala index fd3452089..417a3bcc6 100644 --- a/shared/src/main/scala-2.11-2.12/scala/xml/ScalaVersionSpecific.scala +++ b/shared/src/main/scala-2.11-2.12/scala/xml/ScalaVersionSpecific.scala @@ -20,7 +20,3 @@ private[xml] trait ScalaVersionSpecificNodeSeq extends SeqLike[Node, NodeSeq] { private[xml] trait ScalaVersionSpecificNodeBuffer { self: NodeBuffer => override def stringPrefix: String = "NodeBuffer" } - -private[xml] trait ScalaVersionSpecificIterableSerializable[+A] { // extends Iterable[A] { - // protected[this] override def writeReplace(): AnyRef = this -} diff --git a/shared/src/main/scala-2.13/scala/xml/ScalaVersionSpecific.scala b/shared/src/main/scala-2.13/scala/xml/ScalaVersionSpecific.scala index c47518336..bd2eb820d 100644 --- a/shared/src/main/scala-2.13/scala/xml/ScalaVersionSpecific.scala +++ b/shared/src/main/scala-2.13/scala/xml/ScalaVersionSpecific.scala @@ -19,12 +19,9 @@ private[xml] trait ScalaVersionSpecificNodeSeq with StrictOptimizedSeqOps[Node, immutable.Seq, NodeSeq] { self: NodeSeq => override def fromSpecific(coll: IterableOnce[Node]): NodeSeq = (NodeSeq.newBuilder ++= coll).result() override def newSpecificBuilder: mutable.Builder[Node, NodeSeq] = NodeSeq.newBuilder + override def empty: NodeSeq = NodeSeq.Empty } private[xml] trait ScalaVersionSpecificNodeBuffer { self: NodeBuffer => override def className: String = "NodeBuffer" } - -private[xml] trait ScalaVersionSpecificIterableSerializable[+A] extends Iterable[A] { - protected[this] override def writeReplace(): AnyRef = this -} diff --git a/shared/src/main/scala/scala/xml/MetaData.scala b/shared/src/main/scala/scala/xml/MetaData.scala index fbea65cd3..ee6824b03 100644 --- a/shared/src/main/scala/scala/xml/MetaData.scala +++ b/shared/src/main/scala/scala/xml/MetaData.scala @@ -82,7 +82,6 @@ abstract class MetaData extends AbstractIterable[MetaData] with Iterable[MetaData] with Equality - with ScalaVersionSpecificIterableSerializable[MetaData] with Serializable { /** diff --git a/shared/src/main/scala/scala/xml/NodeSeq.scala b/shared/src/main/scala/scala/xml/NodeSeq.scala index 18c8295b2..56f7507e5 100644 --- a/shared/src/main/scala/scala/xml/NodeSeq.scala +++ b/shared/src/main/scala/scala/xml/NodeSeq.scala @@ -44,7 +44,7 @@ object NodeSeq { * * @author Burak Emir */ -abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with ScalaVersionSpecificNodeSeq with Equality with ScalaVersionSpecificIterableSerializable[Node] with Serializable { +abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with ScalaVersionSpecificNodeSeq with Equality with Serializable { def theSeq: Seq[Node] def length = theSeq.length override def iterator = theSeq.iterator From 242cf9e0f1c36d0af743040c16503e25de6f3ba1 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 5 Apr 2019 11:08:58 +0100 Subject: [PATCH 2/2] bump Scala.js versions for RC1 --- .travis.yml | 10 +++++----- build.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b4884d9c..ee9554c29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,17 +29,17 @@ env: matrix: # The empty SCALAJS_VERSION will only compile for the JVM - SCALAJS_VERSION= - - SCALAJS_VERSION=0.6.26 - - SCALAJS_VERSION=1.0.0-M6 + - SCALAJS_VERSION=0.6.27 + - SCALAJS_VERSION=1.0.0-M7 matrix: exclude: - jdk: openjdk11 - env: SCALAJS_VERSION=0.6.26 + env: SCALAJS_VERSION=0.6.27 - jdk: openjdk11 - env: SCALAJS_VERSION=1.0.0-M6 + env: SCALAJS_VERSION=1.0.0-M7 - scala: 2.11.12 - env: SCALAJS_VERSION=1.0.0-M6 + env: SCALAJS_VERSION=1.0.0-M7 - scala: 2.11.12 jdk: oraclejdk8 - scala: 2.11.12 diff --git a/build.sbt b/build.sbt index eccab34b6..91c112cf1 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) ) }, mimaPreviousVersion := { - if (System.getenv("SCALAJS_VERSION") == "1.0.0-M6") None // No such release yet + if (System.getenv("SCALAJS_VERSION") == "1.0.0-M7") None // No such release yet else Some("1.1.1") }, diff --git a/project/plugins.sbt b/project/plugins.sbt index 4a28009d2..983887349 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ else Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")) val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.26") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")