Removing protocol-raw/ (#507)

build.sbt

@@ -37,7 +37,6 @@ writeVersionToFile := {
 lazy val root = (project in file("."))
   .doPatchDependencies()
   .aggregate(
-    protocolRaw,
     protocolCompiler,
     compiler,
     snapiParser,
@@ -57,37 +56,19 @@ lazy val root = (project in file("."))
     publishLocal / skip := true
   )
 
-lazy val protocolRaw = (project in file("protocol-raw"))
-  .doPatchDependencies()
-  .enablePlugins(ProtobufPlugin)
-  .settings(
-    commonSettings,
-    commonCompileSettings,
-    testSettings,
-    // 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 protocolCompiler = (project in file("protocol-compiler"))
   .doPatchDependencies()
-  .dependsOn(
-    protocolRaw % "compile->compile;test->test;protobuf->protobuf"
-  )
   .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",
-    // Include the protobuf files from the raw package
-    ProtobufConfig / protobufIncludePaths += (protocolRaw / ProtobufConfig / sourceDirectory).value,
     // 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

project/Dependencies.scala

@@ -18,6 +18,8 @@ object Dependencies {
 
   val utilsSources = "com.raw-labs" %% "utils-sources" % "0.50.0"
 
+  val protocolRaw = "com.raw-labs" %% "protocol-raw" % "0.50.0"
+
   val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
 
   val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.12"
@@ -63,7 +65,7 @@ object Dependencies {
   val apacheHttpClient = "org.apache.httpcomponents.client5" % "httpclient5" % "5.2.1"
   val dropboxSDK = "com.dropbox.core" % "dropbox-core-sdk" % "5.4.5"
   val postgresqlDeps = "org.postgresql" % "postgresql" % "42.5.4"
-  val mysqlDeps = "com.mysql" % "mysql-connector-j" % "8.1.0" exclude("com.google.protobuf", "protobuf-java")
+  val mysqlDeps = "com.mysql" % "mysql-connector-j" % "8.1.0" exclude ("com.google.protobuf", "protobuf-java")
   val mssqlDeps = "com.microsoft.sqlserver" % "mssql-jdbc" % "7.0.0.jre10"
   val snowflakeDeps = "net.snowflake" % "snowflake-jdbc" % "3.13.33"
   val oracleDeps = "com.oracle.database.jdbc" % "ojdbc10" % "19.23.0.0"