Skip to content

Commit

Permalink
Merge branch 'main' into upgrade-jwt-scala
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning authored Jan 27, 2024
2 parents 47974a1 + 838dcca commit 2403bb4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,8 @@ lazy val `doc-examples` = project
publish / skip := true,
Dependencies.`Doc-examples`)

val mimaCompareVersion = "1.0.2"

def pekkoConnectorProject(projectId: String,
moduleName: String,
additionalSettings: sbt.Def.SettingsDefinition*): Project = {
Expand All @@ -453,8 +455,7 @@ def pekkoConnectorProject(projectId: String,
licenses := List(License.Apache2),
AutomaticModuleName.settings(s"pekko.stream.connectors.$moduleName"),
mimaPreviousArtifacts := Set(
organization.value %% name.value % previousStableVersion.value
.getOrElse("0.0.0")),
organization.value %% name.value % mimaCompareVersion),
mimaBinaryIssueFilters ++= Seq(
ProblemFilters.exclude[Problem]("*.impl.*"),
// generated code
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ object Dependencies {
val PekkoHttpVersion = PekkoHttpDependency.version
val PekkoHttpBinaryVersion = "1.0"
val ScalaTestVersion = "3.2.17"
val TestContainersScalaTestVersion = "0.40.14"
val TestContainersScalaTestVersion = "0.41.0"
val mockitoVersion = "4.11.0" // check even https://github.com/scalatest/scalatestplus-mockito/releases
val protobufJavaVersion = "3.21.12"
val hoverflyVersion = "0.14.1"
Expand Down Expand Up @@ -98,7 +98,7 @@ object Dependencies {

val Amqp = Seq(
libraryDependencies ++= Seq(
"com.rabbitmq" % "amqp-client" % "5.14.2") ++ Mockito)
"com.rabbitmq" % "amqp-client" % "5.20.0") ++ Mockito)

val AwsLambda = Seq(
libraryDependencies ++= Seq(
Expand Down

0 comments on commit 2403bb4

Please sign in to comment.