Skip to content

Commit

Permalink
Merge branch 'main' into update/junit-4-13-3.2.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning authored Jun 30, 2024
2 parents 79aa018 + 4fa0d5e commit a6f693e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion benchmark-java/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ val root = project
"io.grpc" % "grpc-testing" % grpcVersion,
"org.hdrhistogram" % "HdrHistogram" % "2.1.12",
"org.apache.commons" % "commons-math3" % "3.6.1",
"org.scalatest" %% "scalatest" % "3.2.18" % Test,
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
"org.scalatestplus" %% "junit-4-13" % "3.2.19.0" % Test),
PB.artifactResolver := PB.artifactResolver.dependsOn(codeGenProject / Compile / publishLocal).value)

Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.12</artifactId>
<version>3.2.18</version>
<version>3.2.19</version>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ val grpcVersion = "1.64.0" // checked synced by VersionSyncCheckPlugin
libraryDependencies ++= Seq(
"io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",
"org.apache.pekko" %% "pekko-grpc-interop-tests" % sys.props("project.version") % "test",
"org.scalatest" %% "scalatest" % "3.2.18" % Test)
"org.scalatest" %% "scalatest" % "3.2.19" % Test)

scalacOptions ++= List("-unchecked", "-deprecation", "-language:_", "-encoding", "UTF-8")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ scalacOptions += "-Xfatal-warnings"
enablePlugins(PekkoGrpcPlugin)

libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.2.18" % Test)
"org.scalatest" %% "scalatest" % "3.2.19" % Test)

0 comments on commit a6f693e

Please sign in to comment.