Skip to content

Commit

Permalink
chore(deps): Non-AWS dependency updates (#1121)
Browse files Browse the repository at this point in the history
* Update azure-storage-blob to 12.25.3

* Update fm-sbt-s3-resolver to 0.22.0

* Update sbt-scalafmt to 1.16

* Update sbt-docker-compose to 1.0.35

* Update sbt-native-packager to 1.7.6

* Update commons-io to 2.16.1

* Update netty-tcnative to 2.0.65.Final

* Update commons-compress to 1.26.1

* Update mockito-core to 1.10.19

* Update scala-library to 2.12.19

* Update sbt to 1.9.9

* Update scalatest to 3.2.18

* Update aws-crt to 0.29.17

* bump native packager over to github

* move from deprecated downloadWithResponse to downloadStreamWithResponse

* fix for deprecation

* leave commons compress, there is a snakes nest of changes

---------

Co-authored-by: wellcome-collection-scala-steward[bot] <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com>
Co-authored-by: Robert Kenny <[email protected]>
  • Loading branch information
1 parent d12d592 commit 937fa5d
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object Unarchiver {
}

override def next(): (ArchiveEntry, InputStream) =
(latest, new CloseShieldInputStream(archiveInputStream))
(latest, CloseShieldInputStream.wrap(archiveInputStream))
}

private def uncompress(
Expand Down
12 changes: 0 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import java.io.File
import java.util.UUID

import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider

def setupProject(
project: Project,
folder: String,
Expand Down Expand Up @@ -195,13 +193,3 @@ lazy val ingests_indexer = setupProject(
localDependencies = Seq(display, indexer_common),
description = "Indexes information about ingests in an Elasticsearch cluster"
)

// AWS Credentials to read from S3

s3CredentialsProvider := { _ =>
val builder = new STSAssumeRoleSessionCredentialsProvider.Builder(
"arn:aws:iam::760097843905:role/terraform-20210811133135108800000001",
UUID.randomUUID().toString
)
builder.build()
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AzureRangedReader(implicit blobServiceClient: BlobServiceClient)
}

Try {
blobClient.downloadWithResponse(
blobClient.downloadStreamWithResponse(
stream,
blobRange,
new DownloadRetryOptions,
Expand Down
18 changes: 9 additions & 9 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbt._

object WellcomeDependencies {
val defaultVersion = "32.42.0" // This is automatically bumped by the scala-libs release process, do not edit this line manually
val defaultVersion = "32.42.1" // This is automatically bumped by the scala-libs release process, do not edit this line manually

lazy val versions = new {
val fixtures = defaultVersion
Expand Down Expand Up @@ -80,19 +80,19 @@ object WellcomeDependencies {
)

private def library(name: String, version: String): Seq[ModuleID] = Seq(
"weco" %% name % version,
"weco" %% name % version % "test" classifier "tests"
"org.wellcomecollection" %% name % version,
"org.wellcomecollection" %% name % version % "test" classifier "tests"
)
}

object ExternalDependencies {
lazy val versions = new {

val azure = "12.7.0"
val azure = "12.25.3"
val commonsCompress = "1.5"
val commonsIO = "2.6"
val mockito = "1.9.5"
val scalatest = "3.2.3"
val commonsIO = "2.16.1"
val mockito = "1.10.19"
val scalatest = "3.2.18"
val scalatestPlus = "3.1.2.0"
val scalatestPlusMockitoArtifactId = "mockito-3-2"

Expand All @@ -107,7 +107,7 @@ object ExternalDependencies {
// These are the "Common Runtime Libraries", which you're encouraged to use for
// better performance.
// See https://docs.aws.amazon.com/sdkref/latest/guide/common-runtime.html
val awsCrt = "0.29.16"
val awsCrt = "0.29.17"
}

val azureDependencies: Seq[ModuleID] = Seq(
Expand Down Expand Up @@ -139,7 +139,7 @@ object ExternalDependencies {
)

val nettyDependencies: Seq[ModuleID] = Seq(
"io.netty" % "netty-tcnative" % "2.0.61.Final"
"io.netty" % "netty-tcnative" % "2.0.65.Final"
)

val awsTransferManagerDependencies: Seq[ModuleID] = Seq(
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.9.8
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scalaVersion := "2.12.15"
scalaVersion := "2.12.19"
9 changes: 4 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.5")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")
addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.19.0")
addDependencyTreePlugin
addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.35")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16")
addDependencyTreePlugin

0 comments on commit 937fa5d

Please sign in to comment.