Merge branch 'master' into update/scala-compiler-2.13.16

scalapb · Jan 19, 2025 · bbedce5 · bbedce5
2 parents 3e8cbf5 + aab5caa
commit bbedce5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/benchmarks/project/plugins.sbt b/benchmarks/project/plugins.sbt
@@ -1,6 +1,6 @@
 val ScalapbVersion = sys.env.getOrElse("SCALAPB", "0.10.0-SNAPSHOT")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.27")
 

diff --git a/examples/basic/project/plugins.sbt b/examples/basic/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 
 libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.1"
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -4,14 +4,14 @@ import Keys._
 
 object Dependencies {
   object versions {
-    val grpc                 = "1.68.2"
+    val grpc                 = "1.68.3"
     val protobuf             = "4.28.2"
     val silencer             = "1.7.19"
     val collectionCompat     = "2.12.0"
-    val coursier             = "2.1.23"
+    val coursier             = "2.1.24"
     val protocGen            = "0.9.8"
     val protobufRuntimeScala = "0.8.16"
-    val commonsCodec         = "1.17.1"
+    val commonsCodec         = "1.17.2"
 
     // For testing
     val annotationApi           = "1.3.2"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,10 @@
-val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
+val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.18.1")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
 
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
 
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
@@ -14,7 +14,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
 
 addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")