Merge branch 'master' into update/scalatest-3.2.17

scalapb · Sep 9, 2023 · 58a8a54 · 58a8a54
2 parents b675f12 + 6968c03
commit 58a8a54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,2 +1,2 @@
-version=3.7.12
+version=3.7.14
 runner.dialect=scala213source3
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import scalapb.compiler.Version.scalapbVersion
 
 scalaVersion := "2.13.11"
 
-crossScalaVersions := Seq("2.12.18", "2.13.11", "3.3.0")
+crossScalaVersions := Seq("2.12.18", "2.13.11", "3.3.1")
 
 ThisBuild / organization := "com.thesamet.scalapb"
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,6 +5,6 @@ libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.13"
 
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")