From 9f0856803d424101ccbb309363528cb6eab03592 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 11 Jun 2020 11:38:24 -0700 Subject: [PATCH 1/2] bump Scala 2.12 version to 2.12.11 (was .10) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7672c15b..7a2ca5b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ language: scala scala: - 0.24.0-RC1 - 2.11.12 - - 2.12.10 + - 2.12.11 - 2.13.2 env: From a516a5da736b9c7fb65520cef29056a56c4bef8b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 11 Jun 2020 11:40:23 -0700 Subject: [PATCH 2/2] drop support for Scala.js 0.6 as per scala-js/scala-js#4045 --- .travis.yml | 3 --- project/plugins.sbt | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a2ca5b2..b108a8a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,14 +12,11 @@ scala: env: - ADOPTOPENJDK=8 SCALAJS_VERSION= - - ADOPTOPENJDK=8 SCALAJS_VERSION=0.6.33 - ADOPTOPENJDK=8 SCALAJS_VERSION=1.1.0 - ADOPTOPENJDK=11 SCALAJS_VERSION= matrix: exclude: - - scala: 0.24.0-RC1 - env: ADOPTOPENJDK=8 SCALAJS_VERSION=0.6.33 - scala: 0.24.0-RC1 env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.1.0 include: diff --git a/project/plugins.sbt b/project/plugins.sbt index c12a9328..9651a40c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.33") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.0") val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9")