Skip to content

Commit

Permalink
Update Scala versions and clean build.sbt
Browse files Browse the repository at this point in the history
  • Loading branch information
lolgab committed Nov 16, 2019
1 parent cf5565c commit 1a4b5a8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
16 changes: 5 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,17 @@ script:
scala:
- 2.10.7
- 2.11.12
- 2.12.6
- 2.13.0-M3
- 2.13.0-M4
- 2.12.10
- 2.13.1
jdk:
- openjdk8
env:
- SCALAJS_VERSION=0.6.23
- SCALAJS_VERSION=1.0.0-M3
- SCALAJS_VERSION=1.0.0-M5
- SCALAJS_VERSION=0.6.29
- SCALAJS_VERSION=1.0.0-M8
matrix:
exclude:
- scala: 2.10.7
env: SCALAJS_VERSION=1.0.0-M3
- scala: 2.13.0-M4
env: SCALAJS_VERSION=1.0.0-M3
- scala: 2.10.7
env: SCALAJS_VERSION=1.0.0-M5
env: SCALAJS_VERSION=1.0.0-M8
include:
- scala: 2.11.12
jdk: openjdk8
Expand Down
17 changes: 10 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.10"
val scala213 = "2.13.1"

crossScalaVersions in ThisBuild := {
val allVersions = Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
val allVersions = Seq(scala210, scala211, scala212, scala213)
if (scalaJSVersion.startsWith("0.6."))
allVersions
else if (scalaJSVersion == "1.0.0-M3")
allVersions.filter(v => !v.startsWith("2.10.") && v != "2.13.0-M4")
else
allVersions.filter(!_.startsWith("2.10."))
allVersions.filter(_ != scala210)
}
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
scalaVersion in ThisBuild := scala212

val commonSettings: Seq[Setting[_]] = Seq(
version := "0.1.6-SNAPSHOT",
Expand All @@ -26,8 +29,8 @@ val commonSettings: Seq[Setting[_]] = Seq(
)

val nativeSettings = Seq(
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12"),
scalaVersion := scala211,
crossScalaVersions := Seq(scala211),
sources in (Compile,doc) := Seq.empty
)

Expand Down

0 comments on commit 1a4b5a8

Please sign in to comment.