From d34921158968d915f43363e7e37a2aa8329b7c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20=C4=8Cern=C3=BD?= Date: Mon, 26 Jun 2023 11:52:13 +0200 Subject: [PATCH] Update docker compose, ci/cd, copyright year, Dispatcher deprecation --- .github/workflows/release.yml | 2 +- .../profunktor/fs2rabbit/javaConversion.scala | 2 +- .../profunktor/fs2rabbit/javaConversion.scala | 2 +- .../fs2rabbit/interpreter/RabbitClient.scala | 4 ++-- .../fs2rabbit/AmqpFieldValueSpec.scala | 2 +- .../fs2rabbit/AmqpPropertiesSpec.scala | 2 +- .../profunktor/fs2rabbit/SafeArgSpec.scala | 2 +- .../effects/EnvelopeDecoderSpec.scala | 2 +- docker-compose.yml | 20 ++++++++++--------- .../fs2rabbit/json/Fs2JsonDecoderSpec.scala | 2 +- .../fs2rabbit/json/Fs2JsonEncoderSpec.scala | 2 +- .../dev/profunktor/fs2rabbit/BaseSpec.scala | 2 +- .../fs2rabbit/interpreter/Fs2RabbitSpec.scala | 2 +- .../fs2rabbit/interpreter/RabbitSuite.scala | 2 +- .../CommutativeSemigroupInstancesSpec.scala | 2 +- .../fs2rabbit/laws/EqInstancesSpec.scala | 2 +- .../fs2rabbit/laws/OrderInstancesSpec.scala | 2 +- .../laws/TraverseInstancesSpec.scala | 2 +- .../resiliency/ResilientStreamSpec.scala | 2 +- 19 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 78c352d9..86dc40e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ jobs: build: name: Publish - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: "actions/checkout@v2.3.4" - name: java 11 setup 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 index a98832d8..92565dd5 100644 --- 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-2022 ProfunKtor + * Copyright 2017-2023 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 index 665dbdda..f872b5aa 100644 --- 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-2022 ProfunKtor + * Copyright 2017-2023 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 index 439623e9..e528a1af 100644 --- a/core/src/main/scala/dev/profunktor/fs2rabbit/interpreter/RabbitClient.scala +++ b/core/src/main/scala/dev/profunktor/fs2rabbit/interpreter/RabbitClient.scala @@ -80,7 +80,7 @@ object RabbitClient { saslConfig: SaslConfig = DefaultSaslConfig.PLAIN, metricsCollector: Option[MetricsCollector] = None, threadFactory: Option[F[ThreadFactory]] = None - ): Resource[F, RabbitClient[F]] = Dispatcher[F].evalMap { dispatcher => + ): Resource[F, RabbitClient[F]] = Dispatcher.parallel[F](await = false).evalMap { dispatcher => apply[F](config, dispatcher, sslContext, saslConfig, metricsCollector, threadFactory) } @@ -126,7 +126,7 @@ object RabbitClient { create[F](config, dispatcher, sslContext, saslConfig, metricsCollector, threadFactory, executionContext) def resource: Resource[F, RabbitClient[F]] = - Dispatcher[F].evalMap(build) + Dispatcher.parallel[F](await = false).evalMap(build) } def default[F[_]: Async]( diff --git a/core/src/test/scala/dev/profunktor/fs2rabbit/AmqpFieldValueSpec.scala b/core/src/test/scala/dev/profunktor/fs2rabbit/AmqpFieldValueSpec.scala index 58e755e2..4f97dbe8 100644 --- a/core/src/test/scala/dev/profunktor/fs2rabbit/AmqpFieldValueSpec.scala +++ b/core/src/test/scala/dev/profunktor/fs2rabbit/AmqpFieldValueSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/test/scala/dev/profunktor/fs2rabbit/AmqpPropertiesSpec.scala b/core/src/test/scala/dev/profunktor/fs2rabbit/AmqpPropertiesSpec.scala index b8cc6803..fb4b70fc 100644 --- a/core/src/test/scala/dev/profunktor/fs2rabbit/AmqpPropertiesSpec.scala +++ b/core/src/test/scala/dev/profunktor/fs2rabbit/AmqpPropertiesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/test/scala/dev/profunktor/fs2rabbit/SafeArgSpec.scala b/core/src/test/scala/dev/profunktor/fs2rabbit/SafeArgSpec.scala index 888c33cc..25780a0e 100644 --- a/core/src/test/scala/dev/profunktor/fs2rabbit/SafeArgSpec.scala +++ b/core/src/test/scala/dev/profunktor/fs2rabbit/SafeArgSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/test/scala/dev/profunktor/fs2rabbit/effects/EnvelopeDecoderSpec.scala b/core/src/test/scala/dev/profunktor/fs2rabbit/effects/EnvelopeDecoderSpec.scala index a158a9f8..8352c19a 100644 --- a/core/src/test/scala/dev/profunktor/fs2rabbit/effects/EnvelopeDecoderSpec.scala +++ b/core/src/test/scala/dev/profunktor/fs2rabbit/effects/EnvelopeDecoderSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/docker-compose.yml b/docker-compose.yml index 966c5800..7b0dd171 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,11 @@ -RabbitMQ: - restart: always - image: rabbitmq:alpine - ports: - - "5672:5672" - environment: - - DEBUG=false - volumes: - - ./rabbit-test-config/:/etc/rabbitmq/ +version: '3' +services: + RabbitMQ: + restart: always + image: rabbitmq:alpine + ports: + - "5672:5672" + environment: + - DEBUG=false + volumes: + - ./rabbit-test-config/:/etc/rabbitmq/ diff --git a/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonDecoderSpec.scala b/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonDecoderSpec.scala index 43dc41c5..e2e284bf 100644 --- a/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonDecoderSpec.scala +++ b/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonDecoderSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonEncoderSpec.scala b/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonEncoderSpec.scala index 3fd215af..4e41c255 100644 --- a/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonEncoderSpec.scala +++ b/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonEncoderSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/tests/src/test/scala/dev/profunktor/fs2rabbit/BaseSpec.scala b/tests/src/test/scala/dev/profunktor/fs2rabbit/BaseSpec.scala index 41609041..ce128815 100644 --- a/tests/src/test/scala/dev/profunktor/fs2rabbit/BaseSpec.scala +++ b/tests/src/test/scala/dev/profunktor/fs2rabbit/BaseSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/Fs2RabbitSpec.scala b/tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/Fs2RabbitSpec.scala index 8e1d9a4d..941dd185 100644 --- a/tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/Fs2RabbitSpec.scala +++ b/tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/Fs2RabbitSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/RabbitSuite.scala b/tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/RabbitSuite.scala index fbd99914..9c229ecc 100644 --- a/tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/RabbitSuite.scala +++ b/tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/RabbitSuite.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/CommutativeSemigroupInstancesSpec.scala b/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/CommutativeSemigroupInstancesSpec.scala index 08b26bce..040ac578 100644 --- a/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/CommutativeSemigroupInstancesSpec.scala +++ b/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/CommutativeSemigroupInstancesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/EqInstancesSpec.scala b/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/EqInstancesSpec.scala index 5420dd85..ce9ccc0f 100644 --- a/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/EqInstancesSpec.scala +++ b/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/EqInstancesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/OrderInstancesSpec.scala b/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/OrderInstancesSpec.scala index 3a3d893d..587d7108 100644 --- a/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/OrderInstancesSpec.scala +++ b/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/OrderInstancesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/TraverseInstancesSpec.scala b/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/TraverseInstancesSpec.scala index 790e33f6..03941e31 100644 --- a/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/TraverseInstancesSpec.scala +++ b/tests/src/test/scala/dev/profunktor/fs2rabbit/laws/TraverseInstancesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 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/tests/src/test/scala/dev/profunktor/fs2rabbit/resiliency/ResilientStreamSpec.scala b/tests/src/test/scala/dev/profunktor/fs2rabbit/resiliency/ResilientStreamSpec.scala index 578a827c..a2718ee3 100644 --- a/tests/src/test/scala/dev/profunktor/fs2rabbit/resiliency/ResilientStreamSpec.scala +++ b/tests/src/test/scala/dev/profunktor/fs2rabbit/resiliency/ResilientStreamSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 ProfunKtor + * Copyright 2017-2023 ProfunKtor * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.