Skip to content

Commit

Permalink
scala 2.13.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jbwheatley committed Mar 1, 2021
1 parent a57683e commit 1ec9c26
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Dependencies._
import microsites.ExtraMdFileConfig

ThisBuild / name := """fs2-rabbit"""
ThisBuild / crossScalaVersions := List("2.12.12", "2.13.3")
ThisBuild / crossScalaVersions := List("2.12.12", "2.13.5")
ThisBuild / organization := "dev.profunktor"
ThisBuild / homepage := Some(url("https://fs2-rabbit.profunktor.dev/"))
ThisBuild / licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
Expand Down Expand Up @@ -38,6 +38,7 @@ val commonSettings = List(
headerLicense := Some(HeaderLicense.ALv2("2017-2020", "ProfunKtor")),
scalacOptions in (Compile, doc) ++= List("-no-link-warnings"),
scalacOptions ++= maxClassFileName(scalaVersion.value),
scalacOptions in (Compile, compile) --= List("-Wunused:params"),
libraryDependencies ++= {
List(
compilerPlugin(Libraries.kindProjector),
Expand All @@ -52,7 +53,7 @@ val commonSettings = List(
},
resolvers += "Apache public" at "https://repository.apache.org/content/groups/public/",
scalafmtOnCompile := true,
mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "3.0.1"),
mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "3.0.1")
)

def CoreDependencies(scalaVersionStr: String): List[ModuleID] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ object ConnectionResource {
): F[Connection[Resource[F, *]]] = {
val addThreadFactory: F[ConnectionFactory => Unit] =
threadFactory.fold(Sync[F].pure((_: ConnectionFactory) => ())) { threadFact =>
threadFact.map { tf =>
(cf: ConnectionFactory) => cf.setThreadFactory(tf)
threadFact.map { tf => (cf: ConnectionFactory) =>
cf.setThreadFactory(tf)
}
}
addThreadFactory.flatMap { fn =>
Expand All @@ -56,12 +56,12 @@ object ConnectionResource {
}

private def _make[F[_]: Sync: Log](
conf: Fs2RabbitConfig,
sslCtx: Option[SSLContext],
saslConf: SaslConfig,
metricsCollector: Option[MetricsCollector],
addThreadFactory: ConnectionFactory => Unit
): F[Connection[Resource[F, *]]] = {
conf: Fs2RabbitConfig,
sslCtx: Option[SSLContext],
saslConf: SaslConfig,
metricsCollector: Option[MetricsCollector],
addThreadFactory: ConnectionFactory => Unit
): F[Connection[Resource[F, *]]] =
Sync[F]
.delay {
val factory = new ConnectionFactory()
Expand Down Expand Up @@ -115,7 +115,6 @@ object ConnectionResource {
}
}
}
}
}

trait Connection[F[_]] {
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/scala/dev/profunktor/fs2rabbit/arguments.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ import dev.profunktor.fs2rabbit.javaConversion._

object arguments {

/**
* [[SafeArg]] makes sure the arguments passed to any of the functions are compliant with the AMQP Protocol.
/** [[SafeArg]] makes sure the arguments passed to any of the functions are compliant with the AMQP Protocol.
*
* This library only supports String, Boolean, Int, Long, Float, Short, BigDecimal, Date, Byte, List and Map.
* */
*/
type SafeArg = Evidence[SafeArgument]
type Arguments = Map[String, SafeArg]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ object RabbitClient {
}
}

class RabbitClient[F[_]: Concurrent] private[fs2rabbit] (
class RabbitClient[F[_]] private[fs2rabbit] (
connection: ConnectionResource[F],
consume: Consume[F],
publish: Publish[F],
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ object Dependencies {
val kindProjector = "0.11.3"
val betterMonadicFor = "0.3.1"

val scalaTest = "3.2.4"
val scalaTest = "3.2.5"
val scalaCheck = "1.15.2"
val scalaTestPlusScalaCheck = "3.2.2.0"
val disciplineScalaCheck = "2.1.1"
val disciplineScalaCheck = "2.1.2"
}

object Libraries {
Expand Down

0 comments on commit 1ec9c26

Please sign in to comment.