From e870ee17b4909b29fbf8afa307ef3cef84563b06 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 9 Feb 2024 16:16:13 +0100 Subject: [PATCH] scalatest 3.2.18 (#226) * scalatest 3.2.18 * more changes * Update build.sbt --- benchmark-java/build.sbt | 4 ++-- plugin-tester-java/build.gradle | 4 ++-- plugin-tester-scala/build.gradle | 4 ++-- plugin-tester-scala/pom.xml | 2 +- project/Dependencies.scala | 2 +- sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt | 3 +-- .../src/sbt-test/scala3/01-basic-client-server/build.sbt | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt index fb9f93b1..55307018 100644 --- a/benchmark-java/build.sbt +++ b/benchmark-java/build.sbt @@ -34,8 +34,8 @@ 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.15" % "test", - "org.scalatestplus" %% "junit-4-13" % "3.2.15.0" % "test"), + "org.scalatest" %% "scalatest" % "3.2.18" % Test, + "org.scalatestplus" %% "junit-4-13" % "3.2.18.0" % Test), PB.artifactResolver := PB.artifactResolver.dependsOn(codeGenProject / Compile / publishLocal).value) compile / javacOptions += "-Xlint:deprecation" diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle index 2030edb5..95207063 100644 --- a/plugin-tester-java/build.gradle +++ b/plugin-tester-java/build.gradle @@ -32,8 +32,8 @@ dependencies { implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '1.0.0' implementation "org.scala-lang:scala-library:${scalaFullVersion}" testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.2" - testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15" - testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.15.0" + testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.18" + testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.18.0" } tasks.withType(Copy).configureEach { diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle index 53901566..a7c5d884 100644 --- a/plugin-tester-scala/build.gradle +++ b/plugin-tester-scala/build.gradle @@ -27,8 +27,8 @@ dependencies { implementation group: 'org.apache.pekko', name: "pekko-http-cors_${scalaBinaryVersion}", version: '1.0.0' implementation "org.scala-lang:scala-library:${scalaFullVersion}" testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.0.2" - testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15" - testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.15.0" + testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.18" + testImplementation "org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.18.0" } tasks.withType(Copy).configureEach { diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml index b8052c33..d86e23de 100644 --- a/plugin-tester-scala/pom.xml +++ b/plugin-tester-scala/pom.xml @@ -50,7 +50,7 @@ org.scalatest scalatest_2.12 - 3.0.5 + 3.2.18 test diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cc713168..9aed4e34 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -39,7 +39,7 @@ object Dependencies { val googleProtoc = "3.20.1" // checked synced by VersionSyncCheckPlugin val googleProtobufJava = "3.21.12" - val scalaTest = "3.2.15" + val scalaTest = "3.2.18" val maven = "3.8.6" } diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt index 6e6e3523..cdbdb496 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt @@ -18,8 +18,7 @@ val grpcVersion = "1.54.2" // 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.15" % "test" // ApacheV2 -) + "org.scalatest" %% "scalatest" % "3.2.18" % Test) scalacOptions ++= List("-unchecked", "-deprecation", "-language:_", "-encoding", "UTF-8") diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt index 57de32c3..cc40361d 100644 --- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt +++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt @@ -14,4 +14,4 @@ scalacOptions += "-Xfatal-warnings" enablePlugins(PekkoGrpcPlugin) libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest" % "3.2.15" % "test") + "org.scalatest" %% "scalatest" % "3.2.18" % Test)