Skip to content

Commit

Permalink
Merge pull request #853 from ahjohannessen/wip-bump-fs2-grpc
Browse files Browse the repository at this point in the history
deps: bump fs2-grpc + add scala3 / no lenses codegen options
  • Loading branch information
ahjohannessen authored Oct 18, 2023
2 parents 2d5bc8f + 8158ec4 commit ec6f748
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
15 changes: 13 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@ lazy val core = project
compileM(cats, scodecBits, ip4s, unum, circe, scalaPb) ++
protobufM(scalaPb),
Compile / PB.protoSources := Seq((LocalRootProject / baseDirectory).value / "protobuf"),
Compile / PB.targets := Seq(scalapb.gen(flatPackage = true, grpc = false) -> (Compile / sourceManaged).value)
Compile / PB.targets := Seq(
scalapb.gen(
flatPackage = true,
grpc = false,
scala3Sources = true,
lenses = false
) -> (Compile / sourceManaged).value
)
)
.settings(
mimaBinaryIssueFilters ++= Seq(
Expand All @@ -48,7 +55,11 @@ lazy val `fs2-core` = project
libraryDependencies ++=
compileM(grpcApi, grpcStub, grpcProtobuf, grpcCore) ++
compileM(cats, catsEffect, fs2, ip4s, log4cats, log4catsNoop, scodecBits, circe, circeParser),
scalapbCodeGeneratorOptions += CodeGeneratorOption.FlatPackage,
scalapbCodeGeneratorOptions ++= Seq(
CodeGeneratorOption.FlatPackage,
CodeGeneratorOption.NoLenses,
CodeGeneratorOption.Scala3Sources
),
Compile / PB.protoSources := Seq((LocalRootProject / baseDirectory).value / "protobuf")
)
.settings(
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.0")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.0")
addSbtPlugin("org.typelevel" % "sbt-fs2-grpc" % "2.7.10")
addSbtPlugin("org.typelevel" % "sbt-fs2-grpc" % "2.7.11")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0")

0 comments on commit ec6f748

Please sign in to comment.