Merge branch 'master' into update/sbt-microsites-1.4.4

profunktor · Sep 6, 2024 · ab85ee0 · ab85ee0
2 parents 4df587f + a11fd63
commit ab85ee0
Show file tree

Hide file tree

Showing 98 changed files with 2,381 additions and 934 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,58 +11,58 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2.3.4
-    - uses: olafurpg/setup-scala@v10
+    - uses: actions/checkout@v4
+    - uses: coursier/setup-action@v1
 
     - name: Starting up RabbitMQ
-      run: docker-compose up -d
+      run: docker compose up -d
 
     - name: Cache Coursier dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
-       path: ~/.cache/coursier
-       key: ${{ runner.os }}-${{ github.ref }}-coursier
-       restore-keys: |
-        ${{ runner.os }}-${{ github.ref }}-coursier
+        path: ~/.cache/coursier
+        key: ${{ runner.os }}-${{ github.ref }}-coursier
+        restore-keys: |
+          ${{ runner.os }}-${{ github.ref }}-coursier
 
     - name: Cache Ivy dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ~/.ivy2/cache
         key: ${{ runner.os }}-${{ github.ref }}-ivy2
         restore-keys: |
-         ${{ runner.os }}-${{ github.ref }}-ivy2
+          ${{ runner.os }}-${{ github.ref }}-ivy2
 
     - name: Tests
       run: sbt -J-Xms4G -J-Xmx4G buildFs2Rabbit
 
     - name: Shutting down RabbitMQ
-      run: docker-compose down
+      run: docker compose down
 
   migration-check:
     runs-on: ubuntu-latest
 
     needs: [build]
 
     steps:
-    - uses: actions/checkout@v2.3.4
-    - uses: olafurpg/setup-scala@v13
+    - uses: actions/checkout@v4
+    - uses: coursier/setup-action@v1
 
     - name: Cache Coursier dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
-       path: ~/.cache/coursier
-       key: ${{ runner.os }}-${{ github.ref }}-coursier
-       restore-keys: |
-        ${{ runner.os }}-${{ github.ref }}-coursier
+        path: ~/.cache/coursier
+        key: ${{ runner.os }}-${{ github.ref }}-coursier
+        restore-keys: |
+          ${{ runner.os }}-${{ github.ref }}-coursier
 
     - name: Cache Ivy dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ~/.ivy2/cache
         key: ${{ runner.os }}-${{ github.ref }}-ivy2
         restore-keys: |
-         ${{ runner.os }}-${{ github.ref }}-ivy2
+          ${{ runner.os }}-${{ github.ref }}-ivy2
 
     - name: Tests
       run: sbt -J-Xms4G -J-Xmx4G +mimaReportBinaryIssues
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,14 +1,13 @@
 jobs:
   build:
     name: Publish
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: "actions/[email protected]"
-      - name: java 11 setup
-        uses: "olafurpg/setup-scala@v13"
-        with:
-          java-version: '11'
-      - uses: "olafurpg/setup-gpg@v3"
+      - uses: actions/checkout@v4
+      - name: java setup
+        uses: coursier/setup-action@v1
+
+      - uses: olafurpg/setup-gpg@v3
       - env:
           PGP_PASSPHRASE: "${{ secrets.PGP_PASSPHRASE }}"
           PGP_SECRET: "${{ secrets.PGP_SECRET }}"

diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,4 @@ out
 metals.sbt
 
 # MacOS
-.DS_Store
+.DS_Store
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version   = "3.7.17"
+version   = "3.8.3"
 style     = default
 maxColumn = 120
 align.preset     = most

diff --git a/README.md b/README.md
@@ -32,21 +32,23 @@ Check the [official guide](https://fs2-rabbit.profunktor.dev/guide.html) for upd
 
 ## Adopters
 
-| Company | Description |
-| ------- | ----------- |
-| [Cognotekt](http://www.cognotekt.com/en) | Microservice workflow management in Insuretech AI applications. |
-| [ITV](https://www.itv.com/) | Internal microservices interaction. |
-| [Klarna](https://www.klarna.com/us/) | Microservice for Fintech services. |
-| [Philips Lighting](http://www.lighting.philips.com/main/home) | Internal microservices interaction. |
-| [Free2Move](https://free2move.com) | Microservice communication. |
-| [Descartes Kontainers](https://kontainers.com) | Microservice workflow management - Logistics applications. |
+| Company                                                       | Description                                                     |
+|---------------------------------------------------------------|-----------------------------------------------------------------|
+| [Cognotekt](http://www.cognotekt.com/en)                      | Microservice workflow management in Insuretech AI applications. |
+| [ITV](https://www.itv.com/)                                   | Internal microservices interaction.                             |
+| [Klarna](https://www.klarna.com/us/)                          | Microservice for Fintech services.                              |
+| [Philips Lighting](http://www.lighting.philips.com/main/home) | Internal microservices interaction.                             |
+| [Free2Move](https://free2move.com)                            | Microservice communication.                                     |
+| [Descartes Kontainers](https://kontainers.com)                | Microservice workflow management - Logistics applications.      |
+| [Codacy](https://www.codacy.com)                              | Internal microservices interaction.                             |
+| [Budgetbakers](https://budgetbakers.com)                      | Internal microservices communication - Fintech                  |
 
 ## Running tests locally
 
-Start a `RabbitMQ` instance using `docker-compose` (recommended):
+Start a `RabbitMQ` instance using `docker compose` (recommended):
 
 ```bash
-> docker-compose up
+> docker compose up
 > sbt +test
 ```
 

diff --git a/build.sbt b/build.sbt
@@ -1,11 +1,10 @@
-import com.scalapenos.sbt.prompt.SbtPrompt.autoImport._
-import com.scalapenos.sbt.prompt._
 import Dependencies._
 import microsites.ExtraMdFileConfig
 
-ThisBuild / name               := """fs2-rabbit"""
-ThisBuild / scalaVersion       := "2.13.12"
-ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.3.1")
+ThisBuild / name               := "fs2-rabbit"
+ThisBuild / scalaVersion       := "2.13.14"
+ThisBuild / crossScalaVersions := List("2.12.19", "2.13.14", "3.3.3")
+ThisBuild / versionScheme      := Some("semver-spec")
 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"))
@@ -20,13 +19,6 @@ ThisBuild / developers         := List(
 
 publish / skip := true
 
-promptTheme := PromptTheme(
-  List(
-    text("[sbt] ", fg(105)),
-    text(_ => "fs2-rabbit", fg(15)).padRight(" λ ")
-  )
-)
-
 def scalaOptions(v: String) =
   CrossVersion.partialVersion(v) match {
     case Some((2, 13)) => List.empty[String]
@@ -64,7 +56,7 @@ val commonSettings = List(
   libraryDependencies ++= commonDependencies(scalaVersion.value),
   resolvers += "Apache public" at "https://repository.apache.org/content/groups/public/",
   scalafmtOnCompile     := true,
-  mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "5.0.0")
+  mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %% moduleName.value % _).toSet
 )
 
 def CoreDependencies(scalaVersionStr: String): List[ModuleID] =
@@ -100,10 +92,11 @@ def TestsDependencies(scalaVersionStr: String): List[ModuleID] =
   )
 
 lazy val noPublish = List(
-  publish         := {},
-  publishLocal    := {},
-  publishArtifact := false,
-  publish / skip  := true
+  publish            := {},
+  publishLocal       := {},
+  publishArtifact    := false,
+  publish / skip     := true,
+  crossScalaVersions := Nil
 )
 
 lazy val `fs2-rabbit-root` = project

diff --git a/core/src/main/scala-2.12/dev/profunktor/fs2rabbit/javaConversion.scala b/core/src/main/scala-2.12/dev/profunktor/fs2rabbit/javaConversion.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala-2.13/dev/profunktor/fs2rabbit/javaConversion.scala b/core/src/main/scala-2.13/dev/profunktor/fs2rabbit/javaConversion.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala-3/dev/profunktor/fs2rabbit/javaConversion.scala b/core/src/main/scala-3/dev/profunktor/fs2rabbit/javaConversion.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/AMQPInternals.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/AMQPInternals.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/AckConsuming.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/AckConsuming.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Acking.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Acking.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Binding.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Binding.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/BindingOps.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/BindingOps.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Cancel.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Cancel.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Connection.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Connection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ object ConnectionResource {
         _.map(Executors.newFixedThreadPool(numOfThreads, _))
       }
       .map { es =>
-        sys.addShutdownHook(es.shutdown())
+        val _ = sys.addShutdownHook(es.shutdown())
         es
       }
 
@@ -133,6 +133,7 @@ object ConnectionResource {
         factory.setConnectionTimeout(conf.connectionTimeout.toMillis.toInt)
         factory.setRequestedHeartbeat(conf.requestedHeartbeat.toSeconds.toInt)
         factory.setAutomaticRecoveryEnabled(conf.automaticRecovery)
+        factory.setTopologyRecoveryEnabled(conf.automaticTopologyRecovery)
         if (conf.ssl) sslCtx.fold(factory.useSslProtocol())(factory.useSslProtocol)
         factory.setSaslConfig(saslConf)
         conf.username.foreach(factory.setUsername)
@@ -150,27 +151,29 @@ object ConnectionResource {
 
           private[fs2rabbit] val acquireConnection: F[AMQPConnection] =
             Sync[F]
-              .delay(connectionFactory.newConnection(addresses.toList.asJava, conf.clientProvidedConnectionName.orNull))
+              .blocking(
+                connectionFactory.newConnection(addresses.toList.asJava, conf.clientProvidedConnectionName.orNull)
+              )
               .flatTap(c => Log[F].info(s"Acquired connection: $c"))
               .map(RabbitConnection.apply)
 
           private[fs2rabbit] def acquireChannel(connection: AMQPConnection): F[AMQPChannel] =
             Sync[F]
-              .delay(connection.value.createChannel)
+              .blocking(connection.value.createChannel)
               .flatTap(c => Log[F].info(s"Acquired channel: $c"))
               .map(RabbitChannel.apply)
 
           override def createConnection: Resource[F, AMQPConnection] =
             Resource.make(acquireConnection) { amqpConn =>
               Log[F].info(s"Releasing connection: ${amqpConn.value} previously acquired.") *>
-                Sync[F].delay {
+                Sync[F].blocking {
                   if (amqpConn.value.isOpen) amqpConn.value.close()
                 }
             }
 
           override def createChannel(connection: AMQPConnection): Resource[F, AMQPChannel] =
             Resource.make(acquireChannel(connection)) { amqpChannel =>
-              Sync[F].delay {
+              Sync[F].blocking {
                 if (amqpChannel.value.isOpen) amqpChannel.value.close()
               }
             }

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Consume.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Consume.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import cats.syntax.flatMap._
 import cats.syntax.functor._
 import cats.{Applicative, Functor}
 import com.rabbitmq.client.{AMQP, Consumer, DefaultConsumer, Envelope, ShutdownSignalException}
-import dev.profunktor.fs2rabbit.arguments.{Arguments, _}
+import dev.profunktor.fs2rabbit.arguments._
 import dev.profunktor.fs2rabbit.model._
 
 import scala.util.{Failure, Success, Try}

diff --git a/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Consuming.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Consuming.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ProfunKtor
+ * Copyright 2017-2024 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.