Merge pull request #193 from Philippus/update/scala-2.13.0-RC1

Update scala 2.13.0-M5 to 2.13.0-RC1

Author: SethTisue

.travis.yml

@@ -8,7 +8,7 @@ jdk:
 scala:
   - 2.11.12
   - 2.12.8
-  - 2.13.0-M5
+  - 2.13.0-RC1
 
 env:
   global:
@@ -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
 

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`)
@@ -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}/")),

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)
 

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.