From 1bb0c1be0a9148b628556ef353944d34e2df4a4e Mon Sep 17 00:00:00 2001 From: Philippus Date: Sat, 8 Jun 2019 08:29:42 +0200 Subject: [PATCH 1/3] Add badge for scala 2.13 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4e7145ea..ddd9e316 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [](https://travis-ci.org/scala/scala-parser-combinators) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.12) +[](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.13) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala-parser-combinators) ### Scala Standard Parser Combinator Library From 39086a1daece51fba02f0199ae1d334e28de387c Mon Sep 17 00:00:00 2001 From: Philippus Date: Sat, 8 Jun 2019 08:30:32 +0200 Subject: [PATCH 2/3] Update scalajs 1.0.0-M7 to 1.0.0-M8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ccc72fe8..fd4835ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ env: # The empty SCALAJS_VERSION will only compile for the JVM - SCALAJS_VERSION= - SCALAJS_VERSION=0.6.28 - - SCALAJS_VERSION=1.0.0-M7 + - SCALAJS_VERSION=1.0.0-M8 matrix: include: From aa4fe4f0d4b4f911b57c29fd92baf9ada5db2be8 Mon Sep 17 00:00:00 2001 From: Philippus Date: Sat, 8 Jun 2019 08:30:50 +0200 Subject: [PATCH 3/3] Update scala 2.13.0-RC2 to 2.13.0 --- .travis.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd4835ae..7681bbdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ jdk: scala: - 2.11.12 - 2.12.8 - - 2.13.0-RC2 + - 2.13.0 env: global: diff --git a/build.sbt b/build.sbt index 11017507..a20d0b2e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import ScalaModulePlugin._ import sbtcrossproject.CrossPlugin.autoImport.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") lazy val root = project.in(file(".")) .aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)