Merge branch 'master' into update/scalatest-3.2.17

CleverCloud · Dec 7, 2023 · 31c1fd3 · 31c1fd3
2 parents 92099d5 + 53f88ef
commit 31c1fd3
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,10 +42,10 @@ jobs:
           echo "name:        ${{ steps.import_gpg.outputs.name }}"
           echo "email:       ${{ steps.import_gpg.outputs.email }}"
       - name: run tests
-        run: sbt ++2.12.17 test
+        run: sbt ++2.12 test
 
       - name: publish snapshot
-        run: sbt ++2.12.17 publish
+        run: sbt ++2.12 publish
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -81,10 +81,10 @@ jobs:
           echo "email:       ${{ steps.import_gpg.outputs.email }}"
 
       - name: run tests
-        run: sbt ++2.13.10 test
+        run: sbt ++2.13 test
 
       - name: publish snapshot
-        run: sbt ++2.13.10 publish
+        run: sbt ++2.13 publish
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -120,10 +120,10 @@ jobs:
           echo "email:       ${{ steps.import_gpg.outputs.email }}"
 
       - name: run tests
-        run: sbt ++3.2.1 test
+        run: sbt ++3.3 test
 
       - name: publish snapshot
-        run: sbt ++3.2.1 publish
+        run: sbt ++3.3 publish
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -25,7 +25,7 @@ jobs:
         run: docker-compose up -d
 
       - name: run tests
-        run: sbt ++2.12.17 test
+        run: sbt ++2.12 test
 
   scala-2_13:
     runs-on: ubuntu-latest
@@ -44,7 +44,7 @@ jobs:
         run: docker-compose up -d
 
       - name: run tests
-        run: sbt ++2.13.10 test
+        run: sbt ++2.13 test
 
   scala-3:
     runs-on: ubuntu-latest
@@ -63,4 +63,4 @@ jobs:
         run: docker-compose up -d
 
       - name: run tests
-        run: sbt ++3.2.1 test
+        run: sbt ++3.3 test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,10 +43,10 @@ jobs:
           echo "email:       ${{ steps.import_gpg.outputs.email }}"
 
       - name: run tests
-        run: sbt ++2.12.17 test
+        run: sbt ++2.12 test
 
       - name: publish release
-        run: sbt ++2.12.17 publishSigned
+        run: sbt ++2.12 publishSigned
         env:
           RELEASE_VERSION: ${{ github.event.inputs.version }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
@@ -83,10 +83,10 @@ jobs:
           echo "email:       ${{ steps.import_gpg.outputs.email }}"
 
       - name: run tests
-        run: sbt ++2.13.10 test
+        run: sbt ++2.13 test
 
       - name: publish release
-        run: sbt ++2.13.10 publishSigned
+        run: sbt ++2.13 publishSigned
         env:
           RELEASE_VERSION: ${{ github.event.inputs.version }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
@@ -122,10 +122,10 @@ jobs:
           echo "email:       ${{ steps.import_gpg.outputs.email }}"
 
       - name: run tests
-        run: sbt ++3.2.1 test
+        run: sbt ++3.3 test
 
       - name: publish release
-        run: sbt ++3.2.1 publishSigned
+        run: sbt ++3.3 publishSigned
         env:
           RELEASE_VERSION: ${{ github.event.inputs.version }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
diff --git a/.sbtopts b/.sbtopts
@@ -1,2 +1,2 @@
--J-Xmx4G
--J-XX:MaxMetaspaceSize=1G
+-J-Xmx8G
+-J-XX:MaxMetaspaceSize=2G
diff --git a/build.sbt b/build.sbt
@@ -8,23 +8,23 @@ def publishVersion = if (isRelease) releaseVersion else if (isGithubActions) "2.
 
 val org = "com.clever-cloud.pulsar4s"
 val AkkaStreamVersion = "2.6.20" // compatible with Akka 2.5.x and 2.6.x
-val CatsEffectVersion = "3.4.4"
+val CatsEffectVersion = "3.4.11"
 val CirceVersion = "0.14.3"
 val CommonsIoVersion = "2.4"
 val ExtsVersion = "1.61.1"
 val JacksonVersion = "2.14.1"
-val Log4jVersion = "2.19.0"
+val Log4jVersion = "2.22.0"
 val MonixVersion = "3.4.1"
 val PlayJsonVersion = "2.10.0-RC7"
-val PulsarVersion = "2.10.3"
+val PulsarVersion = "3.1.1"
 val ReactiveStreamsVersion = "1.0.2"
 val FunctionalStreamsVersion = "3.4.0"
-val Json4sVersion = "4.0.6"
+val Json4sVersion = "4.0.7"
 // Version of Avro4s for Scala 2.X
 val Avro4sVersionFor2 = "4.1.0"
 // Version of Avro4s for Scala 3.X
 val Avro4sVersionFor3 = "5.0.3"
-val ScalaVersion = "3.2.1"
+val ScalaVersion = "3.3.1"
 val ScalatestVersion = "3.2.17"
 val ScalazVersion = "7.2.35"
 val Slf4jVersion = "2.0.6"
@@ -34,7 +34,7 @@ val ZIOInteropCatsVersion = "23.0.0.0"
 
 lazy val commonScalaVersionSettings = Seq(
   scalaVersion := ScalaVersion,
-  crossScalaVersions := Seq("2.12.17", "2.13.10", ScalaVersion)
+  crossScalaVersions := Seq("2.12.17", "2.13.12", ScalaVersion)
 )
 
 lazy val warnUnusedImport = Seq(

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   standalone:
-    image: apachepulsar/pulsar:2.8.1
+    image: apachepulsar/pulsar:3.1.1
     ports:
       - "6650:6650"
       - "8080:8080"
@@ -12,7 +12,7 @@ services:
     command: >
       /bin/bash -c
       "bin/apply-config-from-env.py conf/standalone.conf
-      && bin/pulsar standalone --advertised-address standalone"
+      && bin/pulsar standalone"
 
   dashboard:
     profiles: ["dashboard"]

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.3
+sbt.version=1.9.7