From a9d3aec9d686677b3bcf96429d4392c59dc3c3cd Mon Sep 17 00:00:00 2001 From: "Miroslav Chomut (CZ)" Date: Tue, 17 Sep 2024 11:04:18 +0200 Subject: [PATCH] fixes for scala 2.12 --- build.sbt | 6 ++++-- .../scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala | 6 +++--- .../scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala | 6 +++--- project/plugins.sbt | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index f59c396..3ae22a8 100644 --- a/build.sbt +++ b/build.sbt @@ -40,8 +40,10 @@ lazy val models = project commonSettings ++ Seq( name := "KafkaCase-Models", libraryDependencies ++= modelsDependencies, - scalacOptions ++= Seq("-Ymacro-annotations"), - ) + scalacOptions ++= { if (scalaVersion.value.startsWith("2.13")) Seq("-Ymacro-annotations") else Seq("-Xmacro-settings:enable-macro-paradise") } + ) ++ { + if (scalaVersion.value.startsWith("2.12")) {Seq(addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full))} else {Seq.empty} + } ) .enablePlugins(AutomateHeaderPlugin) diff --git a/models/src/main/scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala b/models/src/main/scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala index 4952757..d11d29b 100644 --- a/models/src/main/scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala +++ b/models/src/main/scala/za/co/absa/KafkaCase/Models/EdlaChangeTopic.scala @@ -48,9 +48,9 @@ object EdlaChangeTopic { } implicit val operationDecoder: Decoder[Operation] = Decoder.decodeString.emap { - case s"CREATE" => Right(CREATE()) - case s"UPDATE" => Right(UPDATE()) - case s"ARCHIVE" => Right(ARCHIVE()) + case "CREATE" => Right(CREATE()) + case "UPDATE" => Right(UPDATE()) + case "ARCHIVE" => Right(ARCHIVE()) } } } diff --git a/models/src/main/scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala b/models/src/main/scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala index 954d2ad..d70ccde 100644 --- a/models/src/main/scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala +++ b/models/src/main/scala/za/co/absa/KafkaCase/Models/SchemaRunTopic.scala @@ -48,9 +48,9 @@ object SchemaRunTopic { } implicit val operationDecoder: Decoder[Status] = Decoder.decodeString.emap { - case s"Finished" => Right(Finished()) - case s"Failed" => Right(Failed()) - case s"Killed" => Right(Killed()) + case "Finished" => Right(Finished()) + case "Failed" => Right(Failed()) + case "Killed" => Right(Killed()) } } } diff --git a/project/plugins.sbt b/project/plugins.sbt index 8f246c9..ac92544 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") \ No newline at end of file +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")