From aafc40a166fc7af8a398f8b09817cc0d0dbabbef Mon Sep 17 00:00:00 2001
From: Scala Steward <me@scala-steward.org>
Date: Mon, 11 Jan 2021 23:04:39 +0100
Subject: [PATCH 1/2] Update sbt-scalajs, scalajs-compiler, ... to 1.4.0

---
 .circleci/config.yml | 4 ++--
 .travis.yml          | 2 +-
 project/plugins.sbt  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b095729cc..85bdc8552 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -135,8 +135,8 @@ workflows:
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.12
-          scalajs_version: 1.3.1
+          scalajs_version: 1.4.0
       - scalajs_job:
           name: sjs1.0_2.13
           scala_version: 2.13.4
-          scalajs_version: 1.3.1
+          scalajs_version: 1.4.0
diff --git a/.travis.yml b/.travis.yml
index ba23b1d7b..9758a4bac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ scala:
 
 env:
   - SCALAJS_VERSION=         ADOPTOPENJDK=8
-  - SCALAJS_VERSION=1.3.1    ADOPTOPENJDK=8
+  - SCALAJS_VERSION=1.4.0    ADOPTOPENJDK=8
   - SCALAJS_VERSION=         ADOPTOPENJDK=11
   - SCALAJS_VERSION=         ADOPTOPENJDK=15
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0a92b600d..e70083e6a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.3.1")
+  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.4.0")
 
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.3")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

From 8b88583d904429bdc85d17c7d4ea9ec0f0539e59 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 21 Jan 2021 11:15:36 -0800
Subject: [PATCH 2/2] Scala 2.12.13 (was 2.12.12)

---
 .circleci/config.yml | 18 +++++++++---------
 .travis.yml          |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 85bdc8552..c91fb5898 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,7 +20,7 @@ commands:
     parameters:
       scala_version:
         type: string
-        default: 2.12.12
+        default: 2.12.13
       sbt_tasks:
         type: string
         default: update compile test:compile test doc package osgiBundle
@@ -44,7 +44,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.12
+        default: 2.12.13
         type: string
       java_version:
         description: "Java version"
@@ -61,7 +61,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.12
+        default: 2.12.13
         type: string
       scalajs_version:
         description: "ScalaJS version"
@@ -81,9 +81,9 @@ workflows:
   build:
     jobs:
       - scala_job:
-          name: 2.12.12
+          name: 2.12.13
           java_version: jdk8
-          scala_version: 2.12.12
+          scala_version: 2.12.13
       - scala_job:
           name: 2.13.4
           java_version: jdk8
@@ -99,7 +99,7 @@ workflows:
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
-          scala_version: 2.12.12
+          scala_version: 2.12.13
       - scala_job:
           name: jdk11_2.13
           java_version: jdk11
@@ -111,7 +111,7 @@ workflows:
       - scala_job:
           name: jdk15_2.12
           java_version: jdk15
-          scala_version: 2.12.12
+          scala_version: 2.12.13
       - scala_job:
           name: jdk15_2.13
           java_version: jdk15
@@ -123,7 +123,7 @@ workflows:
       - scala_job:
           name: jdk16_2.12
           java_version: jdk16
-          scala_version: 2.12.12
+          scala_version: 2.12.13
       - scala_job:
           name: jdk16_2.13
           java_version: jdk16
@@ -134,7 +134,7 @@ workflows:
           scala_version: 3.0.0-M3
       - scalajs_job:
           name: sjs1.0_2.12
-          scala_version: 2.12.12
+          scala_version: 2.12.13
           scalajs_version: 1.4.0
       - scalajs_job:
           name: sjs1.0_2.13
diff --git a/.travis.yml b/.travis.yml
index 9758a4bac..7449e1727 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ language: scala
 scala:
   - 3.0.0-M3
   - 3.0.0-M2
-  - 2.12.12
+  - 2.12.13
   - 2.13.4
 
 env: