Merge pull request #1347 from eed3si9n/wip/protoc

Fix build
sbt · Apr 8, 2024 · adc050d · adc050d
2 parents af2c920 + 32b9184
commit adc050d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,6 @@ import ZincBuildUtil._
 import Dependencies._
 import localzinc.Scripted, Scripted._
 import com.typesafe.tools.mima.core._, ProblemFilters._
-import com.github.os72.protocjar.Protoc
 
 def zincRootPath: File = file(sys.props.getOrElse("sbtzinc.path", ".")).getCanonicalFile
 def internalPath = zincRootPath / "internal"
@@ -313,9 +312,6 @@ lazy val zincPersistCore = (project in internalPath / "zinc-persist-core")
     autoScalaLibrary := false,
     exportJars := true,
     ProtobufConfig / version := "3.24.4",
-    ProtobufConfig / protobufRunProtoc := { args =>
-      Protoc.runProtoc(s"-v${(ProtobufConfig / version).value}" +: args.toArray)
-    },
     publish / skip := true,
     assembly / assemblyShadeRules := Seq(
       ShadeRule

diff --git a/...rnal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufReaders.scala b/...rnal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufReaders.scala
@@ -778,7 +778,7 @@ final class ProtobufReaders(mapper: ReadMapper, currentVersion: Schema.Version)
       else expected("local inheritance").!!
     val macroExpansion =
       if (relations.hasMacroExpansion) fromClassDependencies(relations.getMacroExpansion)
-      else expected("macro expansion").!!
+      else new ClassDependencies(Relation.empty, Relation.empty)
     val classes = fromMap(relations.getClassesMap, stringToSource, stringId)
     val productClassName =
       fromMap(relations.getProductClassNameMap, stringId, stringId)

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -7,7 +7,6 @@ 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.8.0")
-libraryDependencies += "com.github.os72" % "protoc-jar" % "3.11.4"
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
 addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")

diff --git a/zinc/src/sbt-test/macros/macro-type-change-2/build.json b/zinc/src/sbt-test/macros/macro-type-change-2/build.json
@@ -6,15 +6,15 @@
         "macros",
         "A"
       ],
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     },
     {
       "name": "macros",
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     },
     {
       "name": "A",
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     }
   ]
 }
diff --git a/zinc/src/sbt-test/macros/macro-type-change-3/build.json b/zinc/src/sbt-test/macros/macro-type-change-3/build.json
@@ -6,15 +6,15 @@
         "macros",
         "A"
       ],
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     },
     {
       "name": "macros",
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     },
     {
       "name": "A",
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     }
   ]
 }
diff --git a/zinc/src/sbt-test/macros/macro-type-change-4/build.json b/zinc/src/sbt-test/macros/macro-type-change-4/build.json
@@ -6,15 +6,15 @@
         "macros",
         "A"
       ],
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     },
     {
       "name": "macros",
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     },
     {
       "name": "A",
-      "scalaVersion": "2.13.12"
+      "scalaVersion": "2.13.13"
     }
   ]
 }