From ab84615fad8d5056bd6d949176f458bf064f302a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 9 Sep 2020 01:35:58 +0200 Subject: [PATCH] Update sbt-scalajs, scalajs-compiler to 1.2.0 --- .travis.yml | 4 ++-- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22fd3a8c..f1f33044 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,13 @@ scala: env: - ADOPTOPENJDK=8 SCALAJS_VERSION= - - ADOPTOPENJDK=8 SCALAJS_VERSION=1.1.1 + - ADOPTOPENJDK=8 SCALAJS_VERSION=1.2.0 - ADOPTOPENJDK=11 SCALAJS_VERSION= matrix: exclude: - scala: 0.26.0-RC1 - env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.1.1 + env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.2.0 include: - scala: 2.11.12 env: ADOPTOPENJDK=8 SCALANATIVE_VERSION=0.3.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 0f764a7d..40f4a6fa 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.1") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.2.0") val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9")