Skip to content

Commit e68e7a8

Browse files
committed
Update Scala.js to 0.6.25 and 1.0.0-M5
1 parent 9033cad commit e68e7a8

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ env:
2929
matrix:
3030
# The empty SCALAJS_VERSION will only compile for the JVM
3131
- SCALAJS_VERSION=
32-
- SCALAJS_VERSION=0.6.23
33-
- SCALAJS_VERSION=1.0.0-M3
32+
- SCALAJS_VERSION=0.6.25
33+
- SCALAJS_VERSION=1.0.0-M5
3434

3535
matrix:
3636
exclude:
3737
- jdk: oraclejdk10
38-
env: SCALAJS_VERSION=0.6.23
38+
env: SCALAJS_VERSION=0.6.25
3939
- jdk: oraclejdk10
40-
env: SCALAJS_VERSION=1.0.0-M3
40+
env: SCALAJS_VERSION=1.0.0-M5
4141
- scala: 2.11.12
4242
jdk: oraclejdk8
4343
- scala: 2.11.12

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
1919
scalacOptions in Test += "-Xxml:coalescing",
2020

2121
mimaPreviousVersion := {
22-
if (System.getenv("SCALAJS_VERSION") == "1.0.0-M3") None // No such release yet
22+
if (System.getenv("SCALAJS_VERSION") == "1.0.0-M5") None // No such release yet
2323
else Some("1.1.0")
2424
},
2525

project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ else
66
Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
77

88
val scalaJSVersion =
9-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.23")
9+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.25")
1010

1111
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
12-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0")
12+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
1313
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")

0 commit comments

Comments
 (0)