Merge branch 'main' into update/protobuf-java-3.25.5

opensnowcat · Oct 22, 2024 · 7b3f95c · 7b3f95c
2 parents c045d38 + e145d1b
commit 7b3f95c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -179,7 +179,8 @@ lazy val pubsubSettings =
     libraryDependencies ++= Seq(
       Dependencies.Libraries.pubsub,
       Dependencies.Libraries.protobuf,
-      Dependencies.Libraries.protobufUtil,
+      Dependencies.Libraries.guava,
+
       // integration tests dependencies
       Dependencies.Libraries.specs2It,
       Dependencies.Libraries.specs2CEIt
@@ -228,7 +229,8 @@ lazy val nsqSettings =
     libraryDependencies ++= Seq(
       Dependencies.Libraries.nsqClient,
       Dependencies.Libraries.jackson,
-      Dependencies.Libraries.log4j
+      Dependencies.Libraries.log4j,
+      Dependencies.Libraries.guava
     )
   )
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -38,6 +38,7 @@ object Dependencies {
     val thrift      = "0.15.0"
     val jnrUnixsock = "0.38.22"
     val protobuf    = "3.25.5"
+    val guava       = "32.1.3-jre"
 
     // Scala
     val collectorPayload = "0.0.0"
@@ -70,16 +71,17 @@ object Dependencies {
     val kafkaClients = "org.apache.kafka" % "kafka-clients"       % V.kafka
     val mskAuth =
       "software.amazon.msk" % "aws-msk-iam-auth" % V.mskAuth % Runtime // Enables AWS MSK IAM authentication https://github.com/snowplow/stream-collector/pull/214
-    val nsqClient      = "com.snowplowanalytics"    % "nsq-java-client"     % V.nsqClient
-    val jodaTime       = "joda-time"                % "joda-time"           % V.jodaTime
-    val slf4j          = "org.slf4j"                % "slf4j-simple"        % V.slf4j
-    val log4jOverSlf4j = "org.slf4j"                % "log4j-over-slf4j"    % V.slf4j
-    val log4j          = "org.apache.logging.log4j" % "log4j-core"          % V.log4j
-    val config         = "com.typesafe"             % "config"              % V.config
-    val jnrUnixsocket  = "com.github.jnr"           % "jnr-unixsocket"      % V.jnrUnixsock
-    val rabbitMQ       = "com.rabbitmq"             % "amqp-client"         % V.rabbitMQ
-    val protobuf       = "com.google.protobuf"      % "protobuf-java"       % V.protobuf
-    val protobufUtil   = "com.google.protobuf"      % "protobuf-java-util"  % V.protobuf
+
+    val nsqClient      = "com.snowplowanalytics"    % "nsq-java-client"  % V.nsqClient
+    val jodaTime       = "joda-time"                % "joda-time"        % V.jodaTime
+    val slf4j          = "org.slf4j"                % "slf4j-simple"     % V.slf4j
+    val log4jOverSlf4j = "org.slf4j"                % "log4j-over-slf4j" % V.slf4j
+    val log4j          = "org.apache.logging.log4j" % "log4j-core"       % V.log4j
+    val config         = "com.typesafe"             % "config"           % V.config
+    val jnrUnixsocket  = "com.github.jnr"           % "jnr-unixsocket"   % V.jnrUnixsock
+    val rabbitMQ       = "com.rabbitmq"             % "amqp-client"      % V.rabbitMQ
+    val protobuf       = "com.google.protobuf"      % "protobuf-java"    % V.protobuf
+    val guava          = "com.google.guava"         % "guava"            % V.guava
 
     // Scala
     val collectorPayload = "com.snowplowanalytics"  % "collector-payload-1"               % V.collectorPayload

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,6 @@
 addSbtPlugin("com.eed3si9n"          % "sbt-assembly"         % "0.15.0")
 addSbtPlugin("com.eed3si9n"          % "sbt-buildinfo"        % "0.12.0")
+addSbtPlugin("net.virtual-void"      % "sbt-dependency-graph" % "0.10.0-RC1")
 addSbtPlugin("org.typelevel"         % "sbt-tpolecat"         % "0.5.1")
 addSbtPlugin("org.scalameta"         % "sbt-scalafmt"         % "2.4.2")
 addSbtPlugin("com.github.sbt"        % "sbt-dynver"           % "5.0.1")