fixup! Update chill-protobuf with protobuf 3.17.1

twitter · Jun 4, 2021 · 9bb3bdf · 9bb3bdf
1 parent 9954eec
commit 9bb3bdf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,6 +6,7 @@ val bijectionVersion = "0.9.7"
 val kryoVersion = "4.0.2"
 val scroogeVersion = "21.2.0"
 val asmVersion = "4.15"
+val protobufVersion = "3.17.1"
 
 def scalaVersionSpecificFolders(srcBaseDir: java.io.File, scalaVersion: String): List[File] =
   CrossVersion.partialVersion(scalaVersion) match {
@@ -260,13 +261,12 @@ lazy val chillProtobuf = module("protobuf")
   .settings(
     crossPaths := false,
     autoScalaLibrary := false,
-    libraryDependencies ++= Seq(
-      "com.google.protobuf" % "protobuf-java" % "3.17.1" % "provided"
-    ),
-    ProtobufConfig / sourceDirectory := (Test / sourceDirectory).value / "protobuf"
+    libraryDependencies += "com.google.protobuf" % "protobuf-java" % protobufVersion % Provided,
+    Test / PB.targets := Seq(
+      PB.gens.java(protobufVersion) -> (Test / sourceManaged).value
+    )
   )
   .dependsOn(chillJava)
-  .enablePlugins(ProtobufPlugin)
 
 lazy val chillAvro = module("avro")
   .settings(

diff --git a/chill-protobuf/src/test/protobuf/test_messages.proto b/chill-protobuf/src/test/protobuf/test_messages.proto
@@ -12,4 +12,5 @@ message FatigueCount {
 enum Gender {
   MALE = 0;
   FEMALE = 1;
+  NONBINARY = 2;
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,4 +6,6 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
-addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.7.0")
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.0")
+
+libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.10"