Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ name := "bucky"

lazy val scala212 = "2.12.18"
lazy val scala213 = "2.13.12"
lazy val scalav3 = "3.3.5"

scalaVersion := scala213
scalacOptions += "-Ypartial-unification"
Expand Down Expand Up @@ -46,9 +47,14 @@ pgpSigningKey := Some("C2B50980F625F2AF9D3CB3AA5709530EE8FA7576")

pgpPassphrase := Option(System.getenv("GPG_KEY_PASSPHRASE")).map(_.toArray)

lazy val scala2Only = Seq(
crossScalaVersions := Seq(),
scalaVersion := scala213
)

lazy val kernelSettings = Seq(
crossScalaVersions := Seq(scala212, scala213),
scalaVersion := scala213,
crossScalaVersions := Seq(scala213, scalav3),
scalaVersion := scalav3,
organization := "com.itv",
scalacOptions ++= Seq("-feature", "-deprecation", "-language:higherKinds"),
publishTo := {
Expand Down Expand Up @@ -222,6 +228,7 @@ lazy val example = project
.settings(name := "com.itv")
.settings(moduleName := "bucky-example")
.settings(kernelSettings)
.settings(scala2Only)
.aggregate(core, argonaut, circe, test)
.dependsOn(core, argonaut, circe, test)
.settings(
Expand All @@ -231,16 +238,17 @@ lazy val example = project
"org.scalatest" %% "scalatest" % scalaTestVersion,
"org.typelevel" %% "cats-effect-testing-scalatest" % catsEffectScalaTestVersion % "test",
"com.typesafe" % "config" % typeSafeVersion,
"ch.qos.logback" % "logback-classic" % logbackVersion,
"dev.profunktor" %% "fs2-rabbit" % "5.0.0",
"dev.profunktor" %% "fs2-rabbit-circe" % "5.0.0"
"ch.qos.logback" % "logback-classic" % logbackVersion,
"dev.profunktor" %% "fs2-rabbit" % "5.0.0",
"dev.profunktor" %% "fs2-rabbit-circe" % "5.0.0"
)
)

lazy val argonaut = project
.settings(name := "com.itv")
.settings(moduleName := "bucky-argonaut")
.settings(kernelSettings)
.settings(scala2Only)
.aggregate(core, test)
.dependsOn(core, test % "test")
.settings(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class CirceMarshallerTest extends AnyFunSuite {
test("Can marshall a json") {
val json: Json = Foo("bar").asJson

val marshaller = implicitly[PayloadMarshaller[Json]]
val marshaller: PayloadMarshaller[Json] = marshallerFromEncodeJson
marshaller(json) shouldBe Payload.from(json)
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/com/itv/bucky/LoggingAmqpClient.scala
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ object LoggingAmqpClient extends StrictLogging {

override def publisher(mandatory: Boolean): F[Publisher[F, PublishCommand]] =
amqpClient.publisher().map { originalPublisher =>
cmd: PublishCommand =>
(cmd: PublishCommand) =>
(for {
result <- originalPublisher(cmd).attempt
_ <- result.fold[F[Unit]](logFailedPublishMessage(_, charset, cmd), _ => logSuccessfullPublishMessage(charset, cmd))
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/com/itv/bucky/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ package object bucky {
implicit class PublisherSugar[F[_]: Applicative](amqpClient: AmqpClient[F]) {

def publisherOf[T](mandatory: Boolean)(implicit publishCommandBuilder: PublishCommandBuilder[T]): F[Publisher[F, T]] =
amqpClient.publisher(mandatory).map { basePublisher => value: T =>
amqpClient.publisher(mandatory).map { basePublisher => (value: T) =>
{
val command = publishCommandBuilder.toPublishCommand(value)
basePublisher.apply(command)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.scalatest.concurrent.{Eventually, IntegrationPatience, ScalaFutures}
import org.scalatest.funsuite.AsyncFunSuite
import org.scalatest.matchers.should.Matchers
import org.scalatest.matchers.should.Matchers._
import com.itv.bucky.ConsumerSugar

import scala.language.reflectiveCalls
import cats.effect.unsafe.IORuntime
Expand Down
Loading