More cleanup

snowplow · Nov 2, 2023 · ab3f9b5 · ab3f9b5
1 parent 7e89645
commit ab3f9b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,6 @@ lazy val buildSettings = Seq(
 
 lazy val root = project
   .in(file("."))
-//  .settings(buildSettings ++ BuildSettings.dynVerSettings)
   .aggregate(kinesis, pubsub, kafka, nsq, stdout, sqs, http4s)
 
 lazy val sinkModuleSettings = 
@@ -64,7 +63,7 @@ lazy val http4s = project
   .configs(IntegrationTest)
 
 lazy val kinesisSettings =
-  sinkModuleSettings ++ Defaults.itSettings ++ BuildSettings.scalifiedSettings ++ Seq(
+  sinkModuleSettings ++ BuildSettings.integrationTestSettings ++ Seq(
     moduleName := "snowplow-stream-collector-kinesis",
     Docker / packageName := "scala-stream-collector-kinesis",
     libraryDependencies ++= Seq(
@@ -75,9 +74,7 @@ lazy val kinesisSettings =
       // integration tests dependencies
       Dependencies.Libraries.IT.specs2,
       Dependencies.Libraries.IT.specs2CE,
-    ),
-    IntegrationTest / test := (IntegrationTest / test).dependsOn(Docker / publishLocal).value,
-    IntegrationTest / testOnly := (IntegrationTest / testOnly).dependsOn(Docker / publishLocal).evaluated
+    )
   )
 
 lazy val kinesis = project
@@ -118,7 +115,7 @@ lazy val sqsDistroless = project
   .dependsOn(http4s % "test->test;compile->compile")
 
 lazy val pubsubSettings =
-  sinkModuleSettings ++ Defaults.itSettings ++ BuildSettings.scalifiedSettings ++ Seq(
+  sinkModuleSettings ++ BuildSettings.integrationTestSettings ++ Seq(
     moduleName := "snowplow-stream-collector-google-pubsub",
     Docker / packageName := "scala-stream-collector-pubsub",
     libraryDependencies ++= Seq(
@@ -127,11 +124,9 @@ lazy val pubsubSettings =
       // integration tests dependencies
       Dependencies.Libraries.IT.specs2, 
       Dependencies.Libraries.IT.specs2CE,
-    ),
-    IntegrationTest / test := (IntegrationTest / test).dependsOn(Docker / publishLocal).value,
-    IntegrationTest / testOnly := (IntegrationTest / testOnly).dependsOn(Docker / publishLocal).evaluated
+    )
   )
-
+  
 lazy val pubsub = project
   .settings(pubsubSettings)
   .enablePlugins(JavaAppPackaging, SnowplowDockerPlugin, BuildInfoPlugin)
@@ -147,7 +142,7 @@ lazy val pubsubDistroless = project
   .configs(IntegrationTest)
 
 lazy val kafkaSettings =
-  sinkModuleSettings ++ Defaults.itSettings ++ Seq(
+  sinkModuleSettings ++ BuildSettings.integrationTestSettings ++ Seq(
     moduleName := "snowplow-stream-collector-kafka",
     Docker / packageName := "scala-stream-collector-kafka",
     libraryDependencies ++= Seq(
@@ -156,9 +151,7 @@ lazy val kafkaSettings =
       // integration tests dependencies
       Dependencies.Libraries.IT.specs2,
       Dependencies.Libraries.IT.specs2CE
-    ),
-    IntegrationTest / test := (IntegrationTest / test).dependsOn(Docker / publishLocal).value,
-    IntegrationTest / testOnly := (IntegrationTest / testOnly).dependsOn(Docker / publishLocal).evaluated
+    )
   )
 
 lazy val kafka = project

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -64,6 +64,11 @@ object BuildSettings {
     }
   )
 
+  lazy val integrationTestSettings = Defaults.itSettings ++ scalifiedSettings ++ Seq(
+    IntegrationTest / test := (IntegrationTest / test).dependsOn(Docker / publishLocal).value,
+    IntegrationTest / testOnly := (IntegrationTest / testOnly).dependsOn(Docker / publishLocal).evaluated
+  )
+
   // Make package (build) metadata available within source code for integration tests.
   lazy val scalifiedSettings = Seq(
     IntegrationTest / sourceGenerators += Def.task {