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
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ scala:
- 2.10.7
- 2.11.12
- 2.12.8
- 2.13.0-RC1
- 2.13.0
jdk:
- openjdk8
env:
- SCALAJS_VERSION=0.6.27
- SCALAJS_VERSION=1.0.0-M7
- SCALAJS_VERSION=0.6.28
- SCALAJS_VERSION=1.0.0-M8
matrix:
exclude:
- scala: 2.10.7
env: SCALAJS_VERSION=1.0.0-M7
env: SCALAJS_VERSION=1.0.0-M8
include:
- scala: 2.12.8
env: SCALAJS_VERSION=0.6.27
env: SCALAJS_VERSION=0.6.28
script:
- sbt readme/run

Expand Down
15 changes: 3 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,15 @@ lazy val root = project.in(file(".")).
name := "Scala.js DOM"

crossScalaVersions in ThisBuild := {
if (scalaJSVersion.startsWith("1.")) Seq("2.12.8", "2.11.12", "2.13.0-RC1")
else Seq("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC1")
if (scalaJSVersion.startsWith("1.")) Seq("2.12.8", "2.11.12", "2.13.0")
else Seq("2.12.8", "2.11.12", "2.10.7", "2.13.0")
}
scalaVersion in ThisBuild := crossScalaVersions.value.head

val commonSettings = Seq(
version := "0.9.8-SNAPSHOT",
organization := "org.scala-js",
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),

// Work around https://github.com/scala-js/scala-js/issues/3612
scalacOptions in (Compile, doc) := {
val prev = (scalacOptions in (Compile, doc)).value
if (scalaJSVersion.startsWith("0.6.") && scalaVersion.value.startsWith("2.13."))
prev.filter(_ != "-Xfatal-warnings")
else
prev
}
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
)

normalizedName := "scalajs-dom"
Expand Down
2 changes: 1 addition & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")

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

Expand Down