Skip to content

Commit 16e756a

Browse files
authored
Merge pull request #212 from scala-steward/update/sbt-scalajs-0.6.28
Update sbt-scalajs to 0.6.28
2 parents 4cbcb66 + 09512c4 commit 16e756a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: .travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
language: scala
22
jdk:
3-
- oraclejdk8
3+
- openjdk8
44
- openjdk11
55

66
scala:
77
- 2.11.12
88
- 2.12.8
9-
- 2.13.0-RC1
9+
- 2.13.0-RC2
1010

1111
env:
1212
global:
@@ -19,13 +19,13 @@ env:
1919
matrix:
2020
# The empty SCALAJS_VERSION will only compile for the JVM
2121
- SCALAJS_VERSION=
22-
- SCALAJS_VERSION=0.6.27
22+
- SCALAJS_VERSION=0.6.28
2323
- SCALAJS_VERSION=1.0.0-M7
2424

2525
matrix:
2626
include:
2727
- env: SCALANATIVE_VERSION=0.3.9
28-
jdk: oraclejdk8
28+
jdk: openjdk8
2929

3030
script: admin/build.sh
3131

Diff for: build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import ScalaModulePlugin._
22
import sbtcrossproject.CrossPlugin.autoImport.crossProject
33

4-
crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC1")
4+
crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC2")
55

66
lazy val root = project.in(file("."))
77
.aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)

Diff for: project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
22

33
val scalaJSVersion =
4-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27")
4+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
55

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

0 commit comments

Comments
 (0)