From 52de10a0da74838efedc5e049437fe5a5c165e8c Mon Sep 17 00:00:00 2001 From: Philippus Date: Wed, 29 May 2019 19:24:24 +0200 Subject: [PATCH 1/3] Update to sbt-scalajs 0.6.28 and 1.0.0-M8 --- .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 af260cfa..b5334823 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ env: matrix: # The empty SCALAJS_VERSION will only compile for the JVM - SCALAJS_VERSION= - - SCALAJS_VERSION=0.6.27 - - SCALAJS_VERSION=1.0.0-M7 + - SCALAJS_VERSION=0.6.28 + - SCALAJS_VERSION=1.0.0-M8 matrix: include: diff --git a/build.sbt b/build.sbt index e4753b7b..cd798038 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-M7"), + mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M8"), 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 525fb023..9918b795 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.27") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) From 9d5163e39b39a8527025fbbc1fb309f984007ba0 Mon Sep 17 00:00:00 2001 From: Philippus Date: Wed, 29 May 2019 19:24:48 +0200 Subject: [PATCH 2/3] Update sbt-scala-native to 0.3.9 --- .travis.yml | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5334823..ff4197a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ env: matrix: include: - - env: SCALANATIVE_VERSION=0.3.8 + - env: SCALANATIVE_VERSION=0.3.9 jdk: oraclejdk8 script: admin/build.sh diff --git a/project/plugins.sbt b/project/plugins.sbt index 9918b795..5c408086 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ val scalaJSVersion = addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) val scalaNativeVersion = - Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.8") + Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9") addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion) From f4c2419aa39c6b237dc17c1b12816252805f0de3 Mon Sep 17 00:00:00 2001 From: Philippus Date: Wed, 29 May 2019 19:58:07 +0200 Subject: [PATCH 3/3] Update scala 2.13.0-RC2 to 2.13.0-RC3 --- .travis.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff4197a8..9b7ba5c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ jdk: scala: - 2.11.12 - 2.12.8 - - 2.13.0-RC2 + - 2.13.0-RC3 env: global: diff --git a/build.sbt b/build.sbt index cd798038..6d566764 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-RC2") +crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC3") lazy val root = project.in(file(".")) .aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)