Skip to content

Commit

Permalink
Merge branch 'master' into update/google-cloud-core-2.38.0
Browse files Browse the repository at this point in the history
Signed-off-by: David Sloan <[email protected]>
  • Loading branch information
davidsloan authored May 6, 2024
2 parents 7d5c427 + 9a8537e commit 732184a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Dependencies {

// scala versions
val scalaOrganization = "org.scala-lang"
val scalaVersion = "2.13.13"
val scalaVersion = "2.13.14"
val supportedScalaVersions: Seq[String] = List(Dependencies.scalaVersion)

val commonResolvers: Seq[MavenRepository] = Resolver.sonatypeOssRepos("public") ++
Expand Down Expand Up @@ -75,14 +75,14 @@ object Dependencies {
val jerseyCommonVersion = "3.1.6"

val calciteVersion = "1.34.0"
val awsSdkVersion = "2.25.40"
val awsSdkVersion = "2.25.45"

val azureDataLakeVersion = "12.18.4"
val azureIdentityVersion = "1.12.0"
val azureCoreVersion = "1.48.0"
val azureCoreVersion = "1.49.0"
val gcpCloudVersion = "2.38.0"

val jacksonVersion = "2.17.0"
val jacksonVersion = "2.17.1"
val json4sVersion = "4.0.7"
val mockitoScalaVersion = "1.17.31"
val mockitoJavaVersion = "5.2.0"
Expand Down Expand Up @@ -146,7 +146,7 @@ object Dependencies {

object Elastic7Versions extends ElasticVersions {
override val elastic4sVersion: String = "7.17.4"
override val elasticSearchVersion: String = "7.17.20"
override val elasticSearchVersion: String = "7.17.21"
override val jnaVersion: String = "5.14.0"
}

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//addDependencyTreePlugin

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.19")
Expand Down

0 comments on commit 732184a

Please sign in to comment.