Skip to content

Commit 949605f

Browse files
committed
Merge branch 'master' into update/sbt-scalafix-0.9.7
2 parents 87faa9d + b1aba5a commit 949605f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ scala:
77

88
env:
99
- SCALAJS_VERSION= ADOPTOPENJDK=8
10-
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
10+
- SCALAJS_VERSION=0.6.29 ADOPTOPENJDK=8
1111
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
1212
- SCALAJS_VERSION= ADOPTOPENJDK=11
13-
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=11
13+
- SCALAJS_VERSION=0.6.29 ADOPTOPENJDK=11
1414
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=11
1515

1616
matrix:

project/build.properties

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

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
val crossVer = "0.6.1"
22
val scalaJSVersion =
3-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
3+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.29")
44
val scalaNativeVersion =
55
Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9")
66

77
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
88
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % crossVer)
99
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
1010
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % crossVer)
11-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.2")
12-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.7")
11+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.3")
12+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.6")
1313
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")

0 commit comments

Comments
 (0)