From f54500e590f0b64594b3131d2d7afa14629fb28f Mon Sep 17 00:00:00 2001
From: Philippus <philippus@gmail.com>
Date: Thu, 4 Apr 2019 18:57:20 +0200
Subject: [PATCH 1/3] Update scala 2.13.0-M5 to 2.13.0-RC1
---
.travis.yml | 2 +-
build.sbt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index da9809c1..a794d153 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ jdk:
scala:
- 2.11.12
- 2.12.8
- - 2.13.0-M5
+ - 2.13.0-RC1
env:
global:
diff --git a/build.sbt b/build.sbt
index 21fb89ec..1bdfdad7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
import ScalaModulePlugin._
import sbtcrossproject.crossProject
-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 root = project.in(file("."))
.aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)
From 4a13a9dd781a3233af7fb7079bc7843fff32dee7 Mon Sep 17 00:00:00 2001
From: Philippus <philippus@gmail.com>
Date: Thu, 4 Apr 2019 19:29:33 +0200
Subject: [PATCH 2/3] Use string interpolation to avoid adding a number and a
string
---
.../main/scala/scala/util/parsing/input/OffsetPosition.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala b/shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala
index 021e9d2f..d3801281 100644
--- a/shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala
+++ b/shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala
@@ -82,7 +82,7 @@ case class OffsetPosition(source: CharSequence, offset: Int) extends Position {
}
/** Returns a string representation of the `Position`, of the form `line.column`. */
- override def toString = line+"."+column
+ override def toString = s"$line.$column"
/** Compare this position to another, by first comparing their line numbers,
* and then -- if necessary -- using the columns to break a tie.
From 5834e821b7dd4fd61c28d339e5638cbb34d62059 Mon Sep 17 00:00:00 2001
From: Philippus <philippus@gmail.com>
Date: Fri, 5 Apr 2019 10:40:58 +0200
Subject: [PATCH 3/3] Update scala-js versions
---
.travis.yml | 4 ++--
build.sbt | 2 +-
project/plugins.sbt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a794d153..4e6056e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,8 @@ 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
script: admin/build.sh
diff --git a/build.sbt b/build.sbt
index 1bdfdad7..1840c2bd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,7 +14,7 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
settings(
name := "scala-parser-combinators",
version := "1.1.2-SNAPSHOT",
- mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M6"),
+ mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M7"),
apiMappings += (scalaInstance.value.libraryJar ->
url(s"https://www.scala-lang.org/api/${scalaVersion.value}/")),
diff --git a/project/plugins.sbt b/project/plugins.sbt
index aed096d9..525fb023 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,7 @@
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
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)