diff --git a/.circleci/config.yml b/.circleci/config.yml index c19e71ba3..19f59f858 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,7 +65,7 @@ jobs: type: string scalajs_version: description: "ScalaJS version" - default: 0.6.33 + default: 1.1.1 type: string environment: SCALAJS_VERSION: << parameters.scalajs_version >> @@ -128,19 +128,11 @@ workflows: name: jdk14_dotty java_version: jdk14 scala_version: 0.27.0-RC1 - - scalajs_job: - name: sjs0.6_2.12 - scala_version: 2.12.10 - scalajs_version: 0.6.33 - - scalajs_job: - name: sjs0.6_2.13 - scala_version: 2.13.1 - scalajs_version: 0.6.33 - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.10 - scalajs_version: 1.0.1 + scalajs_version: 1.1.1 - scalajs_job: name: sjs1.0_2.13 scala_version: 2.13.1 - scalajs_version: 1.0.1 + scalajs_version: 1.1.1 diff --git a/.travis.yml b/.travis.yml index 5876bfbd9..91175f816 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,17 +11,14 @@ scala: env: - SCALAJS_VERSION= ADOPTOPENJDK=8 - - SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8 - - SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 - SCALAJS_VERSION= ADOPTOPENJDK=13 matrix: exclude: - scala: 0.27.0-RC1 - env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8 - - scala: 0.27.0-RC1 - env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 + env: SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8 install: - git fetch --tags # get all tags for sbt-dynver diff --git a/project/plugins.sbt b/project/plugins.sbt index 0bae7a232..46a45723d 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.1") addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")