Skip to content

Commit 1092ca7

Browse files
committed
Upgrades.
* sbt 0.13.16 * Scala 2.10.7, 2.11.12, 2.12.4 and 2.13.0-M2 * Scala.js 0.6.21
1 parent 371d321 commit 1092ca7

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ script:
77
- sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuiteJS/test
88
- sbt ++$TRAVIS_SCALA_VERSION publishLocal
99
scala:
10-
- 2.10.6
11-
- 2.11.11
12-
- 2.12.2
13-
- 2.13.0-M1
10+
- 2.10.7
11+
- 2.11.12
12+
- 2.12.4
13+
- 2.13.0-M2
1414
jdk:
1515
- oraclejdk8
1616
env:
17-
- SCALAJS_VERSION=0.6.18
17+
- SCALAJS_VERSION=0.6.21
1818
- SCALAJS_VERSION=1.0.0-M1
1919

2020
cache:

build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
crossScalaVersions in ThisBuild := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M1")
1+
crossScalaVersions in ThisBuild := Seq("2.12.4", "2.11.12", "2.10.7", "2.13.0-M2")
22
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
33

44
val commonSettings: Seq[Setting[_]] = Seq(
@@ -61,7 +61,8 @@ lazy val testSuite = crossProject.
6161
settings(commonSettings: _*).
6262
settings(
6363
testOptions +=
64-
Tests.Argument(TestFramework("com.novocode.junit.JUnitFramework"), "-v", "-a")
64+
Tests.Argument(TestFramework("com.novocode.junit.JUnitFramework"), "-v", "-a"),
65+
scalacOptions += "-target:jvm-1.8"
6566
).
6667
jsSettings(
6768
name := "java.time testSuite on JS"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.15
1+
sbt.version=0.13.16

project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.21")
33

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

0 commit comments

Comments
 (0)