Skip to content

Commit 0de8f1e

Browse files
committed
Moved kafka code to scala 2 module
1 parent e56e342 commit 0de8f1e

File tree

30 files changed

+17
-25
lines changed

30 files changed

+17
-25
lines changed

build.sbt

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,9 @@ lazy val scala_libraries = (project in file("scala-libraries"))
323323
.configs(IntegrationTest)
324324
.settings(
325325
name := "scala-libraries",
326+
scalaVersion := scalaV,
326327
libraryDependencies ++= scalaTestDeps.map(_.withConfigurations(Some("it,test"))),
328+
resolvers += "Kafka avro serializer" at "https://packages.confluent.io/maven",
327329
libraryDependencies ++= Seq(
328330
"com.github.julien-truffaut" %% "monocle-core" % monocleVersion,
329331
"com.github.julien-truffaut" %% "monocle-macro" % monocleVersion,
@@ -345,7 +347,15 @@ lazy val scala_libraries = (project in file("scala-libraries"))
345347
"org.scala-lang.modules" %% "scala-async" % "1.0.1",
346348
"com.clever-cloud.pulsar4s" %% "pulsar4s-core" % "2.9.1",
347349
"com.clever-cloud.pulsar4s" %% "pulsar4s-jackson" % "2.9.1",
348-
"org.testcontainers" % "pulsar" % "1.19.7" % IntegrationTest
350+
"org.testcontainers" % "pulsar" % "1.19.7" % IntegrationTest,
351+
"org.apache.kafka" % "kafka-clients" % kafkaVersion,
352+
"com.fasterxml.jackson.core" % "jackson-databind" % jackSonVersion,
353+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jackSonVersion,
354+
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jackSonVersion,
355+
"com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion,
356+
"io.confluent" % "kafka-avro-serializer" % kafkaAvroSerializer,
357+
log4jApiScalaDep,
358+
"org.apache.logging.log4j" % "log4j-core" % log4jVersion % Runtime
349359
),
350360
libraryDependencies ++= Seq(
351361
"com.typesafe.slick" %% "slick" % slickVersion,
@@ -459,25 +469,6 @@ val kafkaAvroSerializer = "7.6.0"
459469

460470
val pureConfigDep = "com.github.pureconfig" %% "pureconfig" % pureconfigVersion
461471

462-
lazy val scala_libraries_5 = (project in file("scala-libraries-5"))
463-
.settings(
464-
name := "scala-libraries-5",
465-
resolvers += "Kafka avro serializer" at "https://packages.confluent.io/maven",
466-
scalaVersion := scalaV,
467-
libraryDependencies ++= scalaTestDeps,
468-
libraryDependencies ++= Seq(
469-
"org.apache.kafka" % "kafka-clients" % kafkaVersion,
470-
pureConfigDep,
471-
"com.fasterxml.jackson.core" % "jackson-databind" % jackSonVersion,
472-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jackSonVersion,
473-
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jackSonVersion,
474-
"com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion,
475-
"io.confluent" % "kafka-avro-serializer" % kafkaAvroSerializer,
476-
log4jApiScalaDep,
477-
"org.apache.logging.log4j" % "log4j-core" % log4jVersion % Runtime
478-
)
479-
)
480-
481472
lazy val scala_libraries_fp = (project in file("scala-libraries-fp"))
482473
.settings(
483474
name := "scala-libraries-fp",

scala-libraries-5/README.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

scala-libraries/src/tapir/build.sbt renamed to scala-libraries-standalone/tapir/build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
val tapirV = "1.10.0"
1+
val scalaV = "2.12.16"
2+
val tapirV = "1.0.3"
3+
ThisBuild / scalaVersion := scalaV
24
ThisBuild / version := "1.0.0"
35
ThisBuild / organization := "com.baeldung"
4-
scalaVersion := ScalaVersions.scala3Version
56

67
lazy val endpoint = (project in file("endpoint"))
78
.settings(

scala-libraries/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@
88
- [Better Enumerations in Scala Using Enumeratum](https://www.baeldung.com/scala/enumeratum)
99
- [Load Configuration Files In Scala Using PureConfig](https://www.baeldung.com/scala/pureconfig-load-config-files)
1010
- [Introduction to scala-async](https://www.baeldung.com/scala/scala-async)
11-
- [Apache Pulsar Scala Client – pulsar4s](https://www.baeldung.com/scala/pulsar4s)
11+
- [Apache Pulsar Scala Client – pulsar4s](https://www.baeldung.com/scala/pulsar4s)
12+
- [Introduction to Kafka With Scala](https://www.baeldung.com/scala/kafka)
13+
-

0 commit comments

Comments
 (0)