Skip to content

Commit 3c87dae

Browse files
committed
Merge remote-tracking branch 'origin/master' into scala-steward-update/sbt-scoverage-2.0.6
2 parents b2be403 + fa55dd1 commit 3c87dae

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

build.sbt

+3-4
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,16 @@ libraryDependencies ++= Seq(
4848
"org.asynchttpclient" % "async-http-client" % "2.12.3",
4949
"org.scala-lang.modules" %% "scala-xml" % "2.1.0",
5050
"org.scala-lang.modules" %% "scala-java8-compat"% "1.0.2",
51-
"io.dropwizard.metrics" % "metrics-core" % "4.2.13" % "optional",
51+
"io.dropwizard.metrics" % "metrics-core" % "4.2.15" % "optional",
5252
"org.slf4j" % "slf4j-api" % slf4jVersion,
5353
"org.slf4j" % "slf4j-simple" % slf4jVersion % "test",
5454
"org.scalatest" %% "scalatest" % "3.2.14" % "test",
55-
"org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % "test",
55+
"org.scalatestplus" %% "mockito-4-6" % "3.2.14.0" % "test",
5656
"org.scalatestplus" %% "junit-4-13" % "3.2.14.0" % "test",
5757
"com.github.sbt" % "junit-interface" % "0.13.3" % Test,
58-
"org.mockito" % "mockito-core" % "4.8.1" % "test",
5958
"org.hamcrest" % "hamcrest-library" % "2.2" % "test",
6059
"org.apache.solr" % "solr-test-framework" % solrVersion % "test" excludeAll(ExclusionRule(organization = "org.apache.logging.log4j")),
61-
"com.twitter" %% "util-core" % "22.7.0" % "optional"
60+
"com.twitter" %% "util-core" % "22.12.0" % "optional"
6261
)
6362

6463
// Fork tests so that SolrRunner's shutdown hook kicks in

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.7
1+
sbt.version=1.8.0

project/plugins.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
22
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
3-
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
3+
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.7.0")
44
// use a newer version of paradox (site would pull in automatically an older version)
5-
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2")
6-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33")
5+
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.3")
6+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
77
// addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.4.0")
88
addDependencyTreePlugin
99
/*

0 commit comments

Comments
 (0)