From 13ca2b1635cdd27e082b37874c316a8c01492de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 28 Nov 2017 13:03:16 +0100 Subject: [PATCH 1/5] Upgrade to sbt 0.13.16. Because it is required for Scala.js 0.6.20 and later. --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 64317fdae..c091b86ca 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.16 From e2d1cfa13ad5dfc57260d4909d1401b29a774b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 28 Nov 2017 13:09:22 +0100 Subject: [PATCH 2/5] Upgrade to Scala 2.13.0-M2. Because Scala.js 0.6.21 and 1.0.0-M2 do not support 2.13.0-M1 anymore. --- .travis.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c18076d43..f9fa170a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ scala: - 2.10.6 - 2.11.11 - 2.12.2 - - 2.13.0-M1 + - 2.13.0-M2 jdk: - oraclejdk8 env: diff --git a/build.sbt b/build.sbt index c8e822265..3605637b2 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ lazy val root = project.in(file(".")). name := "Scala.js DOM" -crossScalaVersions in ThisBuild := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M1") +crossScalaVersions in ThisBuild := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M2") scalaVersion in ThisBuild := crossScalaVersions.value.head val commonSettings = Seq( From d3c7a5b46334b3da45276895cf603ac0a5c4cd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 28 Nov 2017 13:31:38 +0100 Subject: [PATCH 3/5] Upgrade to Scala.js 0.6.21. --- .travis.yml | 2 +- project/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9fa170a9..d81763e16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ scala: jdk: - oraclejdk8 env: - - SCALAJS_VERSION=0.6.18 + - SCALAJS_VERSION=0.6.21 - SCALAJS_VERSION=1.0.0-M1 cache: diff --git a/project/build.sbt b/project/build.sbt index e48573939..a7c2eb45e 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,5 +1,5 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18") + Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.21") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) From 7026a9b3b951487441edd1d8f3b569888889d8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 28 Nov 2017 13:38:15 +0100 Subject: [PATCH 4/5] Upgrade to Scala 2.10.7, 2.11.12 and 2.12.4. --- .travis.yml | 6 +++--- build.sbt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d81763e16..f67185f42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ script: - sbt scalafmtTest - sbt ++2.11.11 readme/run scala: - - 2.10.6 - - 2.11.11 - - 2.12.2 + - 2.10.7 + - 2.11.12 + - 2.12.4 - 2.13.0-M2 jdk: - oraclejdk8 diff --git a/build.sbt b/build.sbt index 3605637b2..5f2ea9063 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ lazy val root = project.in(file(".")). name := "Scala.js DOM" -crossScalaVersions in ThisBuild := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M2") +crossScalaVersions in ThisBuild := Seq("2.12.4", "2.11.12", "2.10.7", "2.13.0-M2") scalaVersion in ThisBuild := crossScalaVersions.value.head val commonSettings = Seq( @@ -81,7 +81,7 @@ lazy val readme = ScalatexReadme( targetFolder = "target/site", autoResources = Seq("example-opt.js") ).settings( - scalaVersion := "2.11.11", + scalaVersion := "2.11.12", (resources in Compile) += (fullOptJS in (example, Compile)).value.data ) From 1c6405f1c96eb48e5d4822a26fab39ab2f810055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 28 Nov 2017 13:54:06 +0100 Subject: [PATCH 5/5] Add Scala.js 1.0.0-M2 to the CI matrix. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f67185f42..d3e1dfbf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ jdk: env: - SCALAJS_VERSION=0.6.21 - SCALAJS_VERSION=1.0.0-M1 + - SCALAJS_VERSION=1.0.0-M2 cache: directories: