Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ scala:
jdk:
- oraclejdk8
env:
- SCALAJS_VERSION=1.0.0-M5
- SCALAJS_VERSION=1.0.0-M6
script:
- ./scripts/assemble-cli.sh $SCALAJS_VERSION $TRAVIS_SCALA_VERSION
cache:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '{build}'
os: Windows Server 2012
environment:
global:
SCALAJS_VERSION: 1.0.0-M5
SCALAJS_VERSION: 1.0.0-M6
matrix:
- SCALA_VERSION: 2.11.12
- SCALA_VERSION: 2.12.6
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ inThisBuild(Def.settings(
scalaVersion := crossScalaVersions.value.head,
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),

scalaJSVersion := "1.0.0-M5",
scalaJSVersion := "1.0.0-M6",
scalaJSBinaryVersion := binaryScalaJSVersion(scalaJSVersion.value),

scalaJSScalaVersions := Seq(
Expand All @@ -53,6 +53,7 @@ inThisBuild(Def.settings(
"2.12.4",
"2.12.5",
"2.12.6",
"2.12.7",
),

homepage := Some(url("https://www.scala-js.org/")),
Expand Down