Skip to content

Commit

Permalink
Update oci-java-sdk-objectstorage to 3.0.0 (#192)
Browse files Browse the repository at this point in the history
  • Loading branch information
amir authored Nov 9, 2022
1 parent 402b3ea commit f4dfe52
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val scala_212 = "2.12.17"
lazy val scala_213 = "2.13.10"

lazy val V = new {
val ociSdk = "2.46.0"
val ociSdk = "3.0.0"
val scalaCollectionCompat = "2.8.1"
val zio = "1.0.17"
val `zio-nio` = "1.0.0-RC11"
Expand All @@ -28,6 +28,8 @@ lazy val D = new {
"dev.zio" %% "zio-test" % V.zio,
"dev.zio" %% "zio-test-sbt" % V.zio
)

val `httpclient-jersey` = "com.oracle.oci.sdk" % "oci-java-sdk-common-httpclient-jersey" % V.ociSdk
}

lazy val flags = Seq(
Expand Down Expand Up @@ -102,7 +104,7 @@ lazy val `zio-oci-objectstorage` = project
.settings(Defaults.itSettings)
.settings(
name := "zio-oci-objectstorage",
libraryDependencies ++= D.zio ++ D.objectStorage ++ D.scalaModules ++ D.zioTest.map(_ % "it,test"),
libraryDependencies ++= D.zio ++ D.objectStorage ++ D.scalaModules ++ (D.zioTest :+ D.`httpclient-jersey`).map(_ % "it,test"),
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
)

Expand All @@ -113,7 +115,7 @@ lazy val root = project
.settings(
publish / skip := true,
addCommandAlias("fmtCheck", ";scalafmtCheckAll;scalafmtSbtCheck"),
addCommandAlias("fmt", ";test:scalafmtAll;scalafmtAll;scalafmtSbt;test:scalafmtAll"),
addCommandAlias("fmt", ";Test / scalafmtAll;scalafmtAll;scalafmtSbt;Test / scalafmtAll"),
addCommandAlias("fullTest", ";clean;test;IntegrationTest / test"),
addCommandAlias(
"setReleaseOptions",
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/zio/oci/objectstorage/Live.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package zio.oci.objectstorage

import com.oracle.bmc.Options
import com.oracle.bmc.http.client.Options
import com.oracle.bmc.model.BmcException
import com.oracle.bmc.objectstorage.ObjectStorageAsyncClient
import com.oracle.bmc.objectstorage.responses.{GetObjectResponse, ListBucketsResponse, ListObjectsResponse}
Expand Down Expand Up @@ -100,7 +100,7 @@ object Live {
.fromAutoCloseable(
Task {
// disable sdk's stream auto-close as it's handled by ZStream.fromInputStreamEffect
// https://github.com/oracle/oci-java-sdk/blob/v2.46.0/ApacheConnector-README.md#switching-off-auto-close-of-streams
// https://github.com/oracle/oci-java-sdk/blob/v3.0.0/ApacheConnector-README.md#switching-off-auto-close-of-streams
Options.shouldAutoCloseResponseInputStream(false)
ObjectStorageAsyncClient.builder().region(settings.region).build(settings.auth.auth)
}
Expand Down

0 comments on commit f4dfe52

Please sign in to comment.