Merge branch 'develop' into update/scala-compiler-2.13.13

sbt · Mar 7, 2024 · 8907acf · 8907acf
2 parents 8d13d76 + af67013
commit 8907acf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -7,7 +7,7 @@ object Dependencies {
 
   val scala210 = "2.10.7"
   val scala211 = "2.11.12"
-  val scala212 = "2.12.18"
+  val scala212 = "2.12.19"
   val scala213 = "2.13.13"
   val defaultScalaVersion = scala212
   val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213)

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.9.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,7 +6,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
-addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.7.2")
+addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.7.3")
 libraryDependencies += "com.github.os72" % "protoc-jar" % "3.11.4"
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

diff --git a/zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json b/zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json
@@ -2,7 +2,7 @@
   "projects": [
     {
       "name": "mirtest",
-      "scalaVersion": "2.12.18"
+      "scalaVersion": "2.12.19"
     }
   ]
 }