Skip to content

Commit

Permalink
#395 - bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@regis-leray
regis-leray committed Apr 9, 2024
1 parent fa3d201 commit ca101b5
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 40 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['adopt@1.8']
scala: ['2.12.15', '2.13.8', '3.1.2']
java: ['amazon-corretto@1.17']
scala: ['2.12.15', '2.13.13', '3.3.3']
steps:
- name: Checkout current branch
uses: actions/[email protected]
Expand All @@ -72,7 +72,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['11', '17']
java: ['17', '21']
steps:
- name: Checkout current branch
uses: actions/[email protected]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
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
18 changes: 7 additions & 11 deletions build.sbt
View file
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.25.27"

lazy val root =
project.in(file(".")).settings(publish / skip := true).aggregate(`zio-s3`, docs)
Expand All @@ -38,19 +38,13 @@ 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")
)

Expand All @@ -65,7 +59,9 @@ lazy val docs = project
mainModuleName := (`zio-s3` / moduleName).value,
projectStage := ProjectStage.ProductionReady,
docsPublishBranch := "series/2.x",
ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(`zio-s3`)
ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(`zio-s3`),
//conflict with the dependency zio-nio & sbt-mdoc
excludeDependencies += "org.scala-lang.modules" % "scala-collection-compat_3"
)
.dependsOn(`zio-s3`)
.enablePlugins(WebsitePlugin)
14 changes: 7 additions & 7 deletions project/BuildHelper.scala
View file
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 @@ -117,13 +117,13 @@ object BuildHelper {
crossScalaVersions := Seq(Scala212, Scala213),
ThisBuild / scalaVersion := Scala213,
scalacOptions := stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
semanticdbEnabled := scalaVersion.value != ScalaDotty, // enable SemanticDB
semanticdbOptions += "-P:semanticdb:synthetics:on",
semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version
//semanticdbEnabled := scalaVersion.value != ScalaDotty, // enable SemanticDB
//semanticdbOptions += "-P:semanticdb:synthetics:on",
//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
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.7.1
sbt.version = 1.9.9
8 changes: 5 additions & 3 deletions project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.3")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.3")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16")
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.3.1")
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.3.2")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.5")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.4")

addDependencyTreePlugin
2 changes: 1 addition & 1 deletion zio-s3/src/main/scala/zio/s3/Test.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ object Test {

override def getObject(bucketName: String, key: String): Stream[S3Exception, Byte] =
ZStream
.scoped(ZIO.fromAutoCloseable(ZIO.attempt(new FileInputStream((path / bucketName / key).toFile))))
.scoped[Any](ZIO.fromAutoCloseable(ZIO.attempt(new FileInputStream((path / bucketName / key).toFile))))
.flatMap(ZStream.fromInputStream(_, 2048))
.refineOrDie {
case e: FileNotFoundException => fileNotFound(e)
Expand Down
28 changes: 14 additions & 14 deletions zio-s3/src/test/scala/zio/s3/S3ProvidersTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,80 +27,80 @@ object S3ProvidersTest extends ZIOSpecDefault {
suite("Providers")(
test("basic credentials") {
ZIO
.scoped(basic("k", "v").map(_.resolveCredentials()))
.scoped[Any](basic("k", "v").map(_.resolveCredentials()))
.map(res => assertTrue(res == AwsBasicCredentials.create("k", "v")))
},
test("session credentials") {
ZIO
.scoped(session("k", "v", "t").map(_.resolveCredentials()))
.scoped[Any](session("k", "v", "t").map(_.resolveCredentials()))
.map(res => assertTrue(res == AwsSessionCredentials.create("k", "v", "t")))
},
test("basic credentials default fallback const") {
ZIO
.scoped((env <> basic("k", "v")).map(_.resolveCredentials()))
.scoped[Any]((env <> basic("k", "v")).map(_.resolveCredentials()))
.map(res => assertTrue(res == AwsBasicCredentials.create("k", "v")))
},
test("cred in system properties") {
for {
cred <- ZIO.scoped(system.flatMap(p => ZIO.attempt(p.resolveCredentials())))
cred <- ZIO.scoped[Any](system.flatMap(p => ZIO.attempt(p.resolveCredentials())))
} yield assertTrue(cred == AwsBasicCredentials.create("k1", "s1"))
} @@ flaky @@ around(
setProps(("aws.accessKeyId", "k1"), ("aws.secretAccessKey", "s1")),
unsetProps("aws.accessKeyId", "aws.secretAccessKey")
),
test("no cred in system properties") {
for {
failure <- ZIO.scoped(system).flip.map(_.getMessage)
failure <- ZIO.scoped[Any](system).flip.map(_.getMessage)
} yield assert(failure)(isNonEmptyString)
} @@ around(
unsetProps("aws.accessKeyId", "aws.secretAccessKey"),
ZIO.unit
),
test("no cred in environment properties") {
for {
failure <- ZIO.scoped(env).flip.map(_.getMessage)
failure <- ZIO.scoped[Any](env).flip.map(_.getMessage)
} yield assert(failure)(isNonEmptyString)
},
test("no cred in profile") {
for {
failure <- ZIO.scoped(profile).flip.map(_.getMessage)
failure <- ZIO.scoped[Any](profile).flip.map(_.getMessage)
} yield assert(failure)(isNonEmptyString)
},
test("no cred in named profile") {
for {
failure <- ZIO.scoped(profile(Some("name"))).flip.map(_.getMessage)
failure <- ZIO.scoped[Any](profile(Some("name"))).flip.map(_.getMessage)
} yield assert(failure)(isNonEmptyString)
},
test("no cred in container") {
for {
failure <- ZIO.scoped(container).flip.map(_.getMessage)
failure <- ZIO.scoped[Any](container).flip.map(_.getMessage)
} yield assert(failure)(isNonEmptyString)
},
test("no cred in instance profile credentials") {
for {
failure <- ZIO.scoped(instanceProfile).flip.map(_.getMessage)
failure <- ZIO.scoped[Any](instanceProfile).flip.map(_.getMessage)
} yield assert(failure)(isNonEmptyString)
},
test("no cred in webidentity credentials") {
for {
failure <- ZIO.scoped(webIdentity).flip.map(_.getMessage)
failure <- ZIO.scoped[Any](webIdentity).flip.map(_.getMessage)
} yield assert(failure)(isNonEmptyString)
},
test("settings from invalid creds") {
for {
failure <- ZIO
.scoped(
.scoped[Any](
settings(
Region.AF_SOUTH_1,
ZIO.scoped(system).map(_.resolveCredentials())
ZIO.scoped[Any](system).map(_.resolveCredentials())
).build
)
.flip
} yield assert(failure.getMessage)(isNonEmptyString)
},
test("no cred when chain all providers") {
for {
failure <- ZIO.scoped(default.flatMap(c => ZIO.attempt(c.resolveCredentials()))).flip.map(_.getMessage)
failure <- ZIO.scoped[Any](default.flatMap(c => ZIO.attempt(c.resolveCredentials()))).flip.map(_.getMessage)
} yield assert(failure)(isNonEmptyString)
}
) @@ sequential
Expand Down

0 comments on commit ca101b5

Please sign in to comment.