Skip to content

Commit 2ffbb71

Browse files
committed
Update Scala versions and clean build.sbt
1 parent cf5565c commit 2ffbb71

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

.travis.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,17 @@ script:
99
scala:
1010
- 2.10.7
1111
- 2.11.12
12-
- 2.12.6
13-
- 2.13.0-M3
14-
- 2.13.0-M4
12+
- 2.12.10
13+
- 2.13.1
1514
jdk:
1615
- openjdk8
1716
env:
18-
- SCALAJS_VERSION=0.6.23
19-
- SCALAJS_VERSION=1.0.0-M3
20-
- SCALAJS_VERSION=1.0.0-M5
17+
- SCALAJS_VERSION=0.6.29
18+
- SCALAJS_VERSION=1.0.0-M8
2119
matrix:
2220
exclude:
2321
- scala: 2.10.7
24-
env: SCALAJS_VERSION=1.0.0-M3
25-
- scala: 2.13.0-M4
26-
env: SCALAJS_VERSION=1.0.0-M3
27-
- scala: 2.10.7
28-
env: SCALAJS_VERSION=1.0.0-M5
22+
env: SCALAJS_VERSION=1.0.0-M8
2923
include:
3024
- scala: 2.11.12
3125
jdk: openjdk8

build.sbt

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
22

3+
val scala210 = "2.10.7"
4+
val scala211 = "2.11.12"
5+
val scala212 = "2.12.10"
6+
val scala213 = "2.13.1"
7+
38
crossScalaVersions in ThisBuild := {
4-
val allVersions = Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
9+
val allVersions = Seq(scala210, scala211, scala212, scala213)
510
if (scalaJSVersion.startsWith("0.6."))
611
allVersions
7-
else if (scalaJSVersion == "1.0.0-M3")
8-
allVersions.filter(v => !v.startsWith("2.10.") && v != "2.13.0-M4")
912
else
10-
allVersions.filter(!_.startsWith("2.10."))
13+
allVersions.filter(_ == scala210)
1114
}
12-
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
15+
scalaVersion in ThisBuild := scala212
1316

1417
val commonSettings: Seq[Setting[_]] = Seq(
1518
version := "0.1.6-SNAPSHOT",
@@ -26,8 +29,8 @@ val commonSettings: Seq[Setting[_]] = Seq(
2629
)
2730

2831
val nativeSettings = Seq(
29-
scalaVersion := "2.11.12",
30-
crossScalaVersions := Seq("2.11.12"),
32+
scalaVersion := scala211,
33+
crossScalaVersions := Seq(scala211),
3134
sources in (Compile,doc) := Seq.empty
3235
)
3336

0 commit comments

Comments
 (0)