Skip to content

Commit

Permalink
Update scalapb to 0.11.17 (#155)
Browse files Browse the repository at this point in the history
I've also removed the restrictions on updating it only when updating Pekko, that didn't make any sense...
  • Loading branch information
Ostrzyciel authored Sep 22, 2024
1 parent 0b52319 commit cc501b1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
4 changes: 0 additions & 4 deletions .scala-steward.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
updates.ignore = [
{ groupId = "com.thesamet.scalapb" }
]

pullRequests.grouping = [
{
name = "pekko",
Expand Down
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ lazy val pekkoV = "1.1.1"
lazy val pekkoGrpcV = "1.0.2"
lazy val jenaV = "5.1.0"
lazy val rdf4jV = "5.0.2"
// Must be synchronized to the version used by Pekko gRPC
// See: https://mvnrepository.com/artifact/org.apache.pekko/pekko-grpc-runtime_3
// When updating also change the version in plugins.sbt
lazy val scalapbV = "0.11.13"
// !! When updating ScalaPB also change the version of the plugin in plugins.sbt
lazy val scalapbV = "0.11.17"
lazy val protobufV = "3.25.5"

// List of exclusions for the grpc module and its dependencies
Expand Down
4 changes: 2 additions & 2 deletions project/Transform1.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ object Transform1 {
override def apply(tree: Tree): Tree = tree match {
case Template.After_4_4_0(_, _, _, stats, _) => tree.asInstanceOf[Template].copy(
stats = stats.flatMap { stat => stat match {
// Remove def asRecognized
case Defn.Def.After_4_7_3(_, Term.Name("asRecognized"), _, _, _) => None
// Keep def asRecognized as-is
case Defn.Def.After_4_7_3(_, Term.Name("asRecognized"), _, _, _) => Some(stat)
// Transform def ... => Option[T] to def ... => T
case Defn.Def.After_4_7_3(_, _, _, Some(Type.Apply.After_4_6_0(tpe, typeArgs)), term)
if tpe.syntax == "_root_.scala.Option" => Some(stat.asInstanceOf[Defn.Def].copy(
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
addDependencyTreePlugin

lazy val scalapbV = "0.11.13"
lazy val scalapbV = "0.11.17"

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % scalapbV

0 comments on commit cc501b1

Please sign in to comment.