Update scala to 3.6.3, cats to 2.12, docker-compose to 3.5, fix pipel…

…ines
profunktor · Jan 22, 2025 · ed2f07b · ed2f07b
1 parent 689ddb6
commit ed2f07b
Show file tree

Hide file tree

Showing 85 changed files with 92 additions and 126 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,57 +12,23 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: coursier/setup-action@v1
 
     - name: Starting up RabbitMQ
       run: docker compose up -d
 
-    - name: Cache Coursier dependencies
-      uses: actions/cache@v4
+    - name: Setup Scala using Coursier
+      uses: coursier/setup-action@v1
       with:
-        path: ~/.cache/coursier
-        key: ${{ runner.os }}-${{ github.ref }}-coursier
-        restore-keys: |
-          ${{ runner.os }}-${{ github.ref }}-coursier
+        apps: sbt
 
-    - name: Cache Ivy dependencies
-      uses: actions/cache@v4
-      with:
-        path: ~/.ivy2/cache
-        key: ${{ runner.os }}-${{ github.ref }}-ivy2
-        restore-keys: |
-          ${{ runner.os }}-${{ github.ref }}-ivy2
+    - name: Cache Coursier dependencies
+      uses: coursier/cache-action@v6
 
     - name: Tests
       run: sbt -J-Xms4G -J-Xmx4G buildFs2Rabbit
 
     - name: Shutting down RabbitMQ
       run: docker compose down
 
-  migration-check:
-    runs-on: ubuntu-latest
-
-    needs: [build]
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: coursier/setup-action@v1
-
-    - name: Cache Coursier dependencies
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/coursier
-        key: ${{ runner.os }}-${{ github.ref }}-coursier
-        restore-keys: |
-          ${{ runner.os }}-${{ github.ref }}-coursier
-
-    - name: Cache Ivy dependencies
-      uses: actions/cache@v4
-      with:
-        path: ~/.ivy2/cache
-        key: ${{ runner.os }}-${{ github.ref }}-ivy2
-        restore-keys: |
-          ${{ runner.os }}-${{ github.ref }}-ivy2
-
-    - name: Tests
+    - name: Binary incompatibilities check
       run: sbt -J-Xms4G -J-Xmx4G +mimaReportBinaryIssues
diff --git a/build.sbt b/build.sbt
@@ -4,11 +4,11 @@ import scala.collection.immutable
 
 ThisBuild / name               := "fs2-rabbit"
 ThisBuild / scalaVersion       := "2.13.15"
-ThisBuild / crossScalaVersions := List("2.13.15", "3.3.4", "3.5.2")
+ThisBuild / crossScalaVersions := List("2.13.16", "3.3.4", "3.6.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"))
+ThisBuild / licenses           := List(License.Apache2)
 ThisBuild / developers         := List(
   Developer(
     "gvolpe",
@@ -47,7 +47,7 @@ def commonDependencies(v: String): Seq[ModuleID] =
 val commonSettings = List(
   organizationName      := "ProfunKtor",
   startYear             := Some(2017),
-  licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")),
+  licenses += License.Apache2,
   homepage              := Some(url("https://fs2-rabbit.profunktor.dev/")),
   headerLicense         := Some(HeaderLicense.ALv2(s"${startYear.value.get}-${java.time.Year.now}", "ProfunKtor")),
   Compile / doc / scalacOptions ++= List("-no-link-warnings"),

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-2024 ProfunKtor
+ * Copyright 2017-2025 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-2024 ProfunKtor
+ * Copyright 2017-2025 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-2024 ProfunKtor
+ * Copyright 2017-2025 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-2024 ProfunKtor
+ * Copyright 2017-2025 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-2024 ProfunKtor
+ * Copyright 2017-2025 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-2024 ProfunKtor
+ * Copyright 2017-2025 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-2024 ProfunKtor
+ * Copyright 2017-2025 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-2024 ProfunKtor
+ * Copyright 2017-2025 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-2024 ProfunKtor
+ * Copyright 2017-2025 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/Consume.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Consume.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/Consuming.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Consuming.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/Declaration.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Declaration.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/DeclarationOps.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/DeclarationOps.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/Deletion.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Deletion.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/DeletionOps.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/DeletionOps.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/InternalQueue.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/InternalQueue.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/Publish.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Publish.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/Publishing.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Publishing.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/arguments.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/arguments.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/config/Fs2RabbitConfig.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/config/Fs2RabbitConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/config/declaration.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/config/declaration.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/config/deletion.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/config/deletion.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/effects/BoolValue.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/effects/BoolValue.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/effects/EnvelopeDecoder.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/effects/EnvelopeDecoder.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/effects/Log.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/effects/Log.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/effects/StreamEval.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/effects/StreamEval.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/effects/package.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/effects/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/interpreter/LiveInternalQueue.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/interpreter/LiveInternalQueue.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/interpreter/RabbitClient.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/interpreter/RabbitClient.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/interpreter/RabbitClientOps.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/interpreter/RabbitClientOps.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/AmqpEnvelope.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/AmqpEnvelope.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/AmqpFieldValue.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/AmqpFieldValue.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/AmqpMessage.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/AmqpMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/AmqpProperties.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/AmqpProperties.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/BasicQos.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/BasicQos.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/ConsumerArgs.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/ConsumerArgs.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/Headers.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/Headers.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/PublishReturn.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/PublishReturn.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/ShortString.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/ShortString.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/codec/AmqpFieldDecoder.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/codec/AmqpFieldDecoder.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/codec/AmqpFieldEncoder.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/codec/AmqpFieldEncoder.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/package.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/model/values.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/model/values.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 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/program/AckConsumingProgram.scala b/core/src/main/scala/dev/profunktor/fs2rabbit/program/AckConsumingProgram.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 ProfunKtor
+ * Copyright 2017-2025 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.