Merge pull request #1249 from zio/updates

Updated dependencies

docs/aspects.md

@@ -44,6 +44,6 @@ import zio.aws.core.AwsError
     }
 ```
 
-This aspect can attached to a _client layer_ with the `@@` operator. Multiple aspects can be composed with `>>>`.
+This aspect can attached to a _client layer_ with the `@@@` operator. Multiple aspects can be composed with `>>>`.
 
 To see a full example, check [example #2](https://github.com/vigoo/zio-aws/blob/master/examples/example2/src/main/scala/Main.scala).

docs/changelog.md

@@ -8,6 +8,9 @@ title: Changelog
 Note: this is a manually maintained list of important changes. Because of having auto-release from CI, this
 list may not reflect _all_ changes immediately. Dependencies are continuously updated and are not documented here.
 
+#### 7.x.x.x
+- ZIO 2.0.18 introduced a `ZLayerAspect` which uses the same operator (`@@`) that ZIO AWS was using on layers, but it is not powerful enough to express this library's aspects. The new operator conflicts with the existing extension method, so starting from this version it has been renamed from `@@` to `@@@` to avoid the conflict. 
+
 #### 6.x.x.x
 - Using the new ZIO config providers, compatible with ZIO Config 4.x.x
 

examples/example2/src/main/scala/Main.scala

@@ -55,9 +55,9 @@ object Main extends ZIOAppDefault {
         // Default DynamoDB layer
         // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live
         // DynamoDB with logging
-        // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live @@ logging
+        // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live @@@ logging
         // DynamoDB with circuit breaker
-        // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live @@ circuitBreaking(cb)
+        // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live @@@ circuitBreaking(cb)
 
         val dynamoDb = DynamoDb.live @@ (logging >>> circuitBreaking(cb))
         val finalLayer = awsConfig >>> dynamoDb

integtests/src/test/scala/zio/aws/integtests/DynamoDbTests.scala

@@ -39,7 +39,7 @@ object DynamoDbTests extends ZIOSpecDefault with Logging with Retries {
         .create(AwsBasicCredentials.create("dummy", "key"))
     ).region(Region.US_WEST_2)
       .endpointOverride(new URI("http://localhost:4566"))
-  ) @@ callLogging @@ callRetries
+  ) @@@ callLogging @@@ callRetries
 
   private def testTable(prefix: String): ZIO[DynamoDb, Nothing, ZIO[
     DynamoDb with Scope,

integtests/src/test/scala/zio/aws/integtests/S3Tests.scala

@@ -42,7 +42,7 @@ object S3Tests extends ZIOSpecDefault with Logging with Retries {
     ).region(Region.US_WEST_2)
       .endpointOverride(new URI("http://localhost:4566"))
       .serviceConfiguration(_.pathStyleAccessEnabled(true))
-  ) @@ callLogging @@ callRetries
+  ) @@@ callLogging @@@ callRetries
 
   private def testBucket(
       prefix: String

project/Common.scala

@@ -11,26 +11,26 @@ import scala.collection.JavaConverters._
 object Common extends AutoPlugin {
 
   object autoImport {
-    val zioVersion = "2.0.14"
-    val zioMockVersion = "1.0.0-RC8"
-    val zioCatsInteropVersion = "23.0.0.6"
+    val zioVersion = "2.0.18"
+    val zioMockVersion = "1.0.0-RC11"
+    val zioCatsInteropVersion = "23.1.0.0"
     val zioReactiveStreamsInteropVersion = "2.0.2"
     val zioConfigVersion = "4.0.0-RC16"
-    val zioPreludeVersion = "1.0.0-RC19"
+    val zioPreludeVersion = "1.0.0-RC21"
     val catsEffectVersion = "3.5.2"
 
-    val awsVersion = "2.20.162"
+    val awsVersion = "2.21.15"
     val awsSubVersion = awsVersion.drop(awsVersion.indexOf('.') + 1)
     val http4sVersion = "0.23.19"
     val blazeVersion = "0.23.15"
     val fs2Version = "3.7.0"
 
-    val majorVersion = "6"
+    val majorVersion = "7"
     val zioAwsVersionPrefix = s"$majorVersion.$awsSubVersion."
 
     val scala212Version = "2.12.18"
     val scala213Version = "2.13.12"
-    val scala3Version = "3.2.2"
+    val scala3Version = "3.3.1"
 
     val scalacOptions212 = Seq("-Ypartial-unification", "-deprecation")
     val scalacOptions213 = Seq("-deprecation")

zio-aws-codegen/build.sbt

@@ -1,5 +1,5 @@
-val zioVersion = "2.0.6"
-val awsVersion = "2.20.162"
+val zioVersion = "2.0.18"
+val awsVersion = "2.21.15"
 
 sbtPlugin := true
 scalaVersion := "2.12.18"

zio-aws-codegen/src/main/scala/zio/aws/codegen/generator/GithubActionsGenerator.scala

@@ -37,7 +37,7 @@ trait GithubActionsGenerator {
 
     val scala212 = ScalaVersion("2.12.18")
     val scala213 = ScalaVersion("2.13.12")
-    val scala3 = ScalaVersion("3.2.2")
+    val scala3 = ScalaVersion("3.3.1")
     val scalaVersions = Seq(
       scala212,
       scala213,

zio-aws-core/src/main/scala/zio/aws/core/aspects/package.scala

@@ -81,7 +81,7 @@ package object aspects {
   implicit class ZLayerSyntax[RIn, E, ROut <: AspectSupport[ROut]: Tag](
       layer: ZLayer[RIn, E, ROut]
   ) {
-    def @@[RIn1 <: RIn: Tag](
+    def @@@[RIn1 <: RIn: Tag](
         aspect: AwsCallAspect[RIn1]
     ): ZLayer[RIn1, E, ROut] =
       ZLayer.scoped[RIn1] {

zio-aws-http4s/src/main/scala/zio/aws/http4s/Http4sClient.scala

@@ -96,7 +96,7 @@ class Http4sClient(client: Client[Task], closeFn: () => Unit)(implicit
   ): EntityBody[Task] =
     if (method.canHaveBody) {
       publisher
-        .toStreamBuffered(1)(asyncRuntimeInstance)
+        .toStreamBuffered[Task](1)
         .map(fs2.Chunk.byteBuffer(_))
         .flatMap(Stream.chunk(_))
     } else {