Skip to content

Commit 22f38bc

Browse files
TATSUNO Yasuhirosjrd
TATSUNO Yasuhiro
authored andcommitted
Upgrades. (#369)
* Scala.js 0.6.28 and 1.0.0-M8 * Scala 2.13.0
1 parent f765d49 commit 22f38bc

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

.travis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ scala:
77
- 2.10.7
88
- 2.11.12
99
- 2.12.8
10-
- 2.13.0-RC1
10+
- 2.13.0
1111
jdk:
1212
- openjdk8
1313
env:
14-
- SCALAJS_VERSION=0.6.27
15-
- SCALAJS_VERSION=1.0.0-M7
14+
- SCALAJS_VERSION=0.6.28
15+
- SCALAJS_VERSION=1.0.0-M8
1616
matrix:
1717
exclude:
1818
- scala: 2.10.7
19-
env: SCALAJS_VERSION=1.0.0-M7
19+
env: SCALAJS_VERSION=1.0.0-M8
2020
include:
2121
- scala: 2.12.8
22-
env: SCALAJS_VERSION=0.6.27
22+
env: SCALAJS_VERSION=0.6.28
2323
script:
2424
- sbt readme/run
2525

build.sbt

+3-12
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,15 @@ lazy val root = project.in(file(".")).
66
name := "Scala.js DOM"
77

88
crossScalaVersions in ThisBuild := {
9-
if (scalaJSVersion.startsWith("1.")) Seq("2.12.8", "2.11.12", "2.13.0-RC1")
10-
else Seq("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC1")
9+
if (scalaJSVersion.startsWith("1.")) Seq("2.12.8", "2.11.12", "2.13.0")
10+
else Seq("2.12.8", "2.11.12", "2.10.7", "2.13.0")
1111
}
1212
scalaVersion in ThisBuild := crossScalaVersions.value.head
1313

1414
val commonSettings = Seq(
1515
version := "0.9.8-SNAPSHOT",
1616
organization := "org.scala-js",
17-
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
18-
19-
// Work around https://github.com/scala-js/scala-js/issues/3612
20-
scalacOptions in (Compile, doc) := {
21-
val prev = (scalacOptions in (Compile, doc)).value
22-
if (scalaJSVersion.startsWith("0.6.") && scalaVersion.value.startsWith("2.13."))
23-
prev.filter(_ != "-Xfatal-warnings")
24-
else
25-
prev
26-
}
17+
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
2718
)
2819

2920
normalizedName := "scalajs-dom"

project/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
55

0 commit comments

Comments
 (0)