Merge branch 'master' into update/sbt-1.9.6

scalapb · Sep 17, 2023 · f052738 · f052738
2 parents 91be7c6 + 036510a
commit f052738
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 val scalapbVersion = "0.11.13"
 
 val Scala212 = "2.12.18"
-val Scala213 = "2.13.11"
+val Scala213 = "2.13.12"
 val Scala3 = "3.3.1"
 
 ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3)

diff --git a/example/build.sbt b/example/build.sbt
@@ -3,7 +3,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject}
 
 name := "scalapb-grpcweb-example"
 
-ThisBuild / scalaVersion := "2.13.11"
+ThisBuild / scalaVersion := "2.13.12"
 
 ThisBuild / resolvers ++= Seq(
   Resolver.sonatypeRepo("snapshots"),