Skip to content

Commit fb3802f

Browse files
committed
Merge branch 'master' into update/scribe-slf4j-2.8.6
2 parents d889c51 + 556effc commit fb3802f

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ lazy val `fsi-macros` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
109109
.settings(commonSettings)
110110
.settings(publishSettings)
111111
.settings(
112-
crossScalaVersions := Seq("3.2.2", "2.13.10", scalaVersion.value, "2.11.12"),
112+
crossScalaVersions := Seq("3.2.2", "2.13.11", scalaVersion.value, "2.11.12"),
113113
libraryDependencies ++= {
114114
CrossVersion.partialVersion(scalaVersion.value) match {
115115
case Some((2, _)) => Seq(
116116
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
117-
"org.scalatest" %% "scalatest" % "3.2.16" % Test
117+
"org.scalatest" %% "scalatest" % "3.2.17" % Test
118118
)
119-
case _ => Seq("org.scalatest" %% "scalatest" % "3.2.16" % Test)
119+
case _ => Seq("org.scalatest" %% "scalatest" % "3.2.17" % Test)
120120
}
121121
}
122122
)
@@ -147,9 +147,9 @@ lazy val `fsi-benchmark-core` = crossProject(JVMPlatform)
147147
.settings(commonSettings)
148148
.settings(noPublishSettings)
149149
.settings(
150-
crossScalaVersions := Seq("2.13.10", scalaVersion.value, "2.11.12"),
150+
crossScalaVersions := Seq("2.13.11", scalaVersion.value, "2.11.12"),
151151
libraryDependencies ++= Seq(
152-
"org.scalatest" %% "scalatest" % "3.2.16" % Test
152+
"org.scalatest" %% "scalatest" % "3.2.17" % Test
153153
)
154154
)
155155

@@ -167,7 +167,7 @@ lazy val `fsi-benchmark` = crossProject(JVMPlatform)
167167
"com.dongxiguo" %% "fastring" % "1.0.0",
168168
"com.outr" %% "perfolation" % "1.1.7",
169169
"com.outr" %% "scribe-slf4j" % "2.7.13" % Test,
170-
"org.scalatest" %% "scalatest" % "3.2.16" % Test
170+
"org.scalatest" %% "scalatest" % "3.2.17" % Test
171171
)
172172
)
173173

project/plugins.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
2-
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
1+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
2+
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
44
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9")
55
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
66
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
77
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
8-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7")
9-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")
8+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
9+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
1010
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
11-
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.8")
11+
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11")
1212
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")

0 commit comments

Comments
 (0)