Skip to content

Commit

Permalink
Removing protocol compiler (#508)
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelbranco80 authored Sep 11, 2024
1 parent f385c44 commit cd1b3cb
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 491 deletions.
24 changes: 1 addition & 23 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ writeVersionToFile := {
lazy val root = (project in file("."))
.doPatchDependencies()
.aggregate(
protocolCompiler,
compiler,
snapiParser,
snapiFrontend,
Expand All @@ -56,30 +55,8 @@ lazy val root = (project in file("."))
publishLocal / skip := true
)

lazy val protocolCompiler = (project in file("protocol-compiler"))
.doPatchDependencies()
.enablePlugins(ProtobufPlugin)
.settings(
commonSettings,
commonCompileSettings,
testSettings,
libraryDependencies ++= Seq(
protocolRaw % "compile->compile;test->test;protobuf->protobuf"
),
// Set fixed versions
ProtobufConfig / version := "3.25.4",
ProtobufConfig / protobufGrpcVersion := "1.62.2",
// Forcing the dependency so that 'requires' annotation in module-info.java works properly.
libraryDependencies += "com.google.protobuf" % "protobuf-java" % ((ProtobufConfig / version).value),
// Include the protobuf files in the JAR
Compile / unmanagedResourceDirectories += (ProtobufConfig / sourceDirectory).value
)

lazy val compiler = (project in file("compiler"))
.doPatchDependencies()
.dependsOn(
protocolCompiler % "compile->compile;test->test"
)
.settings(
commonSettings,
// Ignore deprecation warnings in the compiler. Needed for a Jackson feature we require.
Expand All @@ -88,6 +65,7 @@ lazy val compiler = (project in file("compiler"))
testSettings,
libraryDependencies ++= Seq(
utilsCore % "compile->compile;test->test",
protocolCompiler % "compile->compile;test->test",
trufflePolyglot
) ++ jacksonDeps
)
Expand Down
2 changes: 2 additions & 0 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ object Dependencies {

val protocolRaw = "com.raw-labs" %% "protocol-raw" % "0.50.0"

val protocolCompiler = "com.raw-labs" %% "protocol-compiler" % "0.50.0"

val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"

val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.12"
Expand Down

This file was deleted.

18 changes: 0 additions & 18 deletions protocol-compiler/src/main/java/module-info.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit cd1b3cb

Please sign in to comment.