From ab3eda0c4f5ba70d525968241b7222865c2fc48a Mon Sep 17 00:00:00 2001 From: regis-leray Date: Tue, 9 Apr 2024 16:37:16 -0400 Subject: [PATCH] #395 - bump dependencies --- .github/workflows/ci.yml | 2 +- .gitignore | 1 + build.sbt | 20 ++++++++++---------- project/BuildHelper.scala | 8 ++++---- project/build.properties | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51f6ccae..ca80707c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: fail-fast: false matrix: java: ['adopt@1.8'] - scala: ['2.12.15', '2.13.8', '3.1.2'] + scala: ['2.12.15', '2.13.13', '3.3.3'] steps: - name: Checkout current branch uses: actions/checkout@v3.3.0 diff --git a/.gitignore b/.gitignore index 86c23752..e37e10b8 100644 --- a/.gitignore +++ b/.gitignore @@ -422,3 +422,4 @@ website/static/api .minio.sys/ .vscode/ +/zio-s3/src/test/scala/zio/s3/S3App.scala diff --git a/build.sbt b/build.sbt index 54a67b98..cd0c3609 100644 --- a/build.sbt +++ b/build.sbt @@ -22,8 +22,8 @@ inThisBuild( addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt") addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck") -val zioVersion = "2.0.2" -val awsVersion = "2.16.61" +val zioVersion = "2.0.21" +val awsVersion = "2.23.4" lazy val root = project.in(file(".")).settings(publish / skip := true).aggregate(`zio-s3`, docs) @@ -38,20 +38,20 @@ lazy val `zio-s3` = project libraryDependencies ++= Seq( "dev.zio" %% "zio" % zioVersion, "dev.zio" %% "zio-streams" % zioVersion, - "dev.zio" %% "zio-nio" % "2.0.0", - "dev.zio" %% "zio-interop-reactivestreams" % "2.0.0", + "dev.zio" %% "zio-nio" % "2.0.2", + "dev.zio" %% "zio-interop-reactivestreams" % "2.0.2", "software.amazon.awssdk" % "s3" % awsVersion, "software.amazon.awssdk" % "sts" % awsVersion, "dev.zio" %% "zio-test" % zioVersion % Test, "dev.zio" %% "zio-test-sbt" % zioVersion % Test ), libraryDependencies ++= { - if (scalaVersion.value == ScalaDotty) - Seq() - else - Seq("org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1") - }, - testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework") + CrossVersion.partialVersion(scalaVersion.value) match { + case Some((2, _)) => Seq("org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0") + case _ => Seq.empty + } + } + , testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework") ) lazy val docs = project diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index cd15678d..13b564d6 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -9,8 +9,8 @@ import scalafix.sbt.ScalafixPlugin.autoImport._ object BuildHelper { val Scala212 = "2.12.15" - val Scala213 = "2.13.8" - val ScalaDotty = "3.1.2" + val Scala213 = "2.13.13" + val ScalaDotty = "3.3.3" private val stdOptions = Seq( "-deprecation", @@ -122,8 +122,8 @@ object BuildHelper { semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value), ThisBuild / scalafixDependencies ++= List( - "com.github.liancheng" %% "organize-imports" % "0.4.3", - "com.github.vovapolu" %% "scaluzzi" % "0.1.15" + "com.github.liancheng" %% "organize-imports" % "0.6.0", + "com.github.vovapolu" %% "scaluzzi" % "0.1.23" ), Test / parallelExecution := true, incOptions ~= (_.withLogRecompileOnMacro(false)), diff --git a/project/build.properties b/project/build.properties index d738b858..49214c4b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.7.1 +sbt.version = 1.9.9