Skip to content

Commit 5d42771

Browse files
committed
Merge branch 'main' into update/scala-library-2.12.14
2 parents 48d52c3 + 8963416 commit 5d42771

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ language: scala
77
scala:
88
- 2.11.12
99
- 2.12.13
10-
- 2.13.5
10+
- 2.13.6
1111
- 3.0.0-RC3
1212
- 3.0.0
1313

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ lazy val root = project
5454
lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
5555

5656
lazy val scala211 = "2.11.12"
57-
lazy val scala212 = "2.12.14"
58-
lazy val scala213 = "2.13.5"
57+
lazy val scala212 = "2.12.13"
58+
lazy val scala213 = "2.13.6"
5959
lazy val scala30 = "3.0.0"
6060

6161
lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform)(

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJ
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.3.0")
11+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1")
1212
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.28")
1313
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
1414
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.1")

0 commit comments

Comments
 (0)