Skip to content

Commit

Permalink
#395 - bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
regis-leray committed Apr 9, 2024
1 parent fa3d201 commit ab3eda0
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
fail-fast: false
matrix:
java: ['[email protected]']
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/[email protected]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -422,3 +422,4 @@ website/static/api
.minio.sys/

.vscode/
/zio-s3/src/test/scala/zio/s3/S3App.scala
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.7.1
sbt.version = 1.9.9

0 comments on commit ab3eda0

Please sign in to comment.