Merge branch 'main' into add-group-map-to

.travis.yml

@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 2.13.3
+  - 2.13.4
 
 env:
   - SCALAJS_BUILD=     ADOPTOPENJDK=8

NOTICE

@@ -1,6 +1,6 @@
 scala-library-next
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
+Copyright (c) 2002-2021 EPFL
+Copyright (c) 2011-2021 Lightbend, Inc.
 
 Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and

build.sbt

@@ -11,7 +11,7 @@ lazy val scalaLibraryNext = crossProject(JVMPlatform, JSPlatform)
   .crossType(CrossType.Pure)
   .in(file("."))
   .jvmSettings(
-    libraryDependencies += "junit" % "junit" % "4.13.1" % Test,
+    libraryDependencies += "junit" % "junit" % "4.13.2" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
   )
@@ -21,7 +21,7 @@ lazy val scalaLibraryNext = crossProject(JVMPlatform, JSPlatform)
     scalaModuleMimaPreviousVersion := None,
     scalacOptions ++= Seq("-deprecation", "-feature", "-Werror"),
     libraryDependencies ++= Seq(
-      "org.scalacheck" %%% "scalacheck" % "1.15.1" % Test,
+      "org.scalacheck" %%% "scalacheck" % "1.15.3" % Test,
     ),
   )
   .jsSettings(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.4
+sbt.version=1.4.9

project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.3")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.1")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")