separate out kafka-test so that core code can build with scala 3

apache · Sep 2, 2023 · 9e559ef · 9e559ef
1 parent 2680316
commit 9e559ef
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -131,14 +131,24 @@ lazy val eventsourced =
 // provides offset storage backed by Kafka managed offset commits
 lazy val kafka =
   Project(id = "kafka", base = file("kafka"))
-    .configs(IntegrationTest)
     .enablePlugins(ReproducibleBuildsPlugin)
-    .settings(headerSettings(IntegrationTest))
-    .settings(Defaults.itSettings)
+    .settings(crossScalaVersions := Dependencies.Scala2And3Versions)
     .settings(Dependencies.kafka)
     .settings(
       name := "pekko-projection-kafka")
     .dependsOn(core)
+
+lazy val kafkaTest =
+  Project(id = "kafka-test", base = file("kafka-test"))
+    .configs(IntegrationTest)
+    .enablePlugins(ReproducibleBuildsPlugin)
+    .settings(headerSettings(IntegrationTest))
+    .settings(Defaults.itSettings)
+    .settings(Dependencies.kafkaTest)
+    .settings(
+      name := "pekko-projection-kafka-test",
+      publish / skip := true)
+    .dependsOn(kafka)
     .dependsOn(testkit % Test)
     .dependsOn(slick % "test->test;it->it")
 
@@ -169,7 +179,7 @@ lazy val examples = project
   .dependsOn(cassandra % "test->test;test->it")
   .dependsOn(eventsourced)
   .dependsOn(`durable-state`)
-  .dependsOn(kafka % "test->test")
+  .dependsOn(kafkaTest % "test->test")
   .dependsOn(testkit % Test)
   .settings(publish / skip := true, scalacOptions += "-feature", javacOptions += "-parameters")
 
@@ -207,7 +217,7 @@ lazy val docs = project
     apidocRootPackage := "org.apache.pekko")
 
 lazy val root = Project(id = "projection", base = file("."))
-  .aggregate(core, coreTest, testkit, jdbc, slick, cassandra, eventsourced, kafka, `durable-state`, examples, docs)
+  .aggregate(core, coreTest, testkit, jdbc, slick, cassandra, eventsourced, kafka, kafkaTest, `durable-state`, examples, docs)
   .settings(
     publish / skip := true,
     name := "pekko-projection-root")

diff --git a/kafka/src/it/resources/application.conf → kafka-test/src/it/resources/application.conf b/kafka/src/it/resources/application.conf → kafka-test/src/it/resources/application.conf
diff --git a/kafka/src/it/resources/logback-test.xml → kafka-test/src/it/resources/logback-test.xml b/kafka/src/it/resources/logback-test.xml → kafka-test/src/it/resources/logback-test.xml
diff --git a/...ction/kafka/KafkaSourceProviderSpec.scala → ...ction/kafka/KafkaSourceProviderSpec.scala b/...ction/kafka/KafkaSourceProviderSpec.scala → ...ction/kafka/KafkaSourceProviderSpec.scala
diff --git a/...ekko/projection/kafka/KafkaSpecBase.scala → ...ekko/projection/kafka/KafkaSpecBase.scala b/...ekko/projection/kafka/KafkaSpecBase.scala → ...ekko/projection/kafka/KafkaSpecBase.scala
diff --git a/...gration/KafkaToSlickIntegrationSpec.scala → ...gration/KafkaToSlickIntegrationSpec.scala b/...gration/KafkaToSlickIntegrationSpec.scala → ...gration/KafkaToSlickIntegrationSpec.scala
diff --git a/kafka/src/test/resources/application.conf → ...-test/src/test/resources/application.conf b/kafka/src/test/resources/application.conf → ...-test/src/test/resources/application.conf
diff --git a/kafka/src/test/resources/logback-test.xml → ...-test/src/test/resources/logback-test.xml b/kafka/src/test/resources/logback-test.xml → ...-test/src/test/resources/logback-test.xml
diff --git a/...nternal/KafkaSourceProviderImplSpec.scala → ...nternal/KafkaSourceProviderImplSpec.scala b/...nternal/KafkaSourceProviderImplSpec.scala → ...nternal/KafkaSourceProviderImplSpec.scala
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -188,7 +188,10 @@ object Dependencies {
   val kafka =
     deps ++= Seq(
       Compile.connectorsKafka,
-      Compile.jackson,
+      Compile.jackson)
+
+  val kafkaTest =
+    deps ++= Seq(
       Test.scalatest,
       Test.pekkoTypedTestkit,
       Test.pekkoStreamTestkit,