From 0a43f470cf5bcee0182086034e67c421c2581982 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 14 Dec 2019 15:58:49 +0100 Subject: [PATCH 1/2] Update sbt to 1.3.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index abfd235..5cad107 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ # Not 1.3.0 due to https://github.com/sbt/sbt/issues/5043 -sbt.version=1.2.8 +sbt.version=1.3.5 From 504b47b53a283d1bbfa432aa0be5079f58f8106f Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sat, 14 Dec 2019 09:50:14 -0800 Subject: [PATCH 2/2] assorted version bumps --- .travis.yml | 8 ++++---- project/plugins.sbt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b8b848..0790764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ scala: - 2.13.0 env: - - SCALAJS_VERSION= ADOPTOPENJDK=8 - - SCALAJS_VERSION=0.6.29 ADOPTOPENJDK=8 - - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8 - - SCALAJS_VERSION= ADOPTOPENJDK=11 + - SCALAJS_VERSION= ADOPTOPENJDK=8 + - SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8 + - SCALAJS_VERSION= ADOPTOPENJDK=11 before_install: # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation diff --git a/project/plugins.sbt b/project/plugins.sbt index 649ce0f..bc92150 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.29") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.31") -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.2") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)