diff --git a/build.sbt b/build.sbt index 44b7f6e9..9a721d7b 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,3 @@ -import CustomSettings._ def itFilter(name: String): Boolean = name endsWith "IntegrationSpec" @@ -10,24 +9,24 @@ lazy val UnitTest = config("ut").extend(Test) lazy val commonConfigs = Seq(ItTest, UnitTest) +val libatsVersion = "2.4.1" + lazy val commonDeps = libraryDependencies ++= { - val scalaTestV = "3.2.16" - lazy val libatsV = libatsVersion.value + val scalaTestV = "3.2.17" lazy val catsV = "2.10.0" Seq( "org.scala-lang.modules" %% "scala-async" % "1.0.1", "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided, - "io.github.uptane" %% "libats" % libatsV, + "io.github.uptane" %% "libats" % libatsVersion, "org.scalatest" %% "scalatest" % scalaTestV % "test", "org.typelevel" %% "cats-core" % catsV, ) } lazy val serverDependencies = libraryDependencies ++= { - lazy val akkaV = "2.6.20" - lazy val akkaHttpV = "10.2.10" - lazy val libatsV = libatsVersion.value + lazy val akkaV = "2.8.5" + lazy val akkaHttpV = "10.5.2" Seq( "com.typesafe.akka" %% "akka-actor" % akkaV, @@ -38,14 +37,14 @@ lazy val serverDependencies = libraryDependencies ++= { "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV % "test", "com.softwaremill.sttp.client" %% "akka-http-backend" % "2.3.0" % "test", - "io.github.uptane" %% "libats-http" % libatsV, - "io.github.uptane" %% "libats-http-tracing" % libatsV, - "io.github.uptane" %% "libats-messaging" % libatsV, - "io.github.uptane" %% "libats-metrics-akka" % libatsV, - "io.github.uptane" %% "libats-metrics-prometheus" % libatsV, - "io.github.uptane" %% "libats-slick" % libatsV, - "io.github.uptane" %% "libats-logging" % libatsV, - "org.mariadb.jdbc" % "mariadb-java-client" % "3.1.4" + "io.github.uptane" %% "libats-http" % libatsVersion, + "io.github.uptane" %% "libats-http-tracing" % libatsVersion, + "io.github.uptane" %% "libats-messaging" % libatsVersion, + "io.github.uptane" %% "libats-metrics-akka" % libatsVersion, + "io.github.uptane" %% "libats-metrics-prometheus" % libatsVersion, + "io.github.uptane" %% "libats-slick" % libatsVersion, + "io.github.uptane" %% "libats-logging" % libatsVersion, + "org.mariadb.jdbc" % "mariadb-java-client" % "3.2.0" ) } @@ -59,7 +58,6 @@ lazy val commonSettings = Seq( Compile / console / scalacOptions ~= (_.filterNot(_ == "-Ywarn-unused-import")), resolvers += "sonatype-snapshots" at "https://s01.oss.sonatype.org/content/repositories/snapshots", resolvers += "sonatype-releases" at "https://s01.oss.sonatype.org/content/repositories/releases", - libatsVersion := "2.1.2", licenses += ("MPL-2.0", url("http://mozilla.org/MPL/2.0/")), description := "scala tuf implementation support", buildInfoOptions += BuildInfoOption.ToMap, diff --git a/cli/build.sbt b/cli/build.sbt index 44630d7c..c4ea67a8 100644 --- a/cli/build.sbt +++ b/cli/build.sbt @@ -1,11 +1,11 @@ libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0" -libraryDependencies += "org.slf4j" % "slf4j-api" % "2.0.7" +libraryDependencies += "org.slf4j" % "slf4j-api" % "2.0.9" libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.4.11" libraryDependencies += "io.circe" %% "circe-generic-extras" % "0.14.3" -libraryDependencies += "io.circe" %% "circe-literal" % "0.14.5" % Test +libraryDependencies += "io.circe" %% "circe-literal" % "0.14.6" % Test fork := true diff --git a/libtuf/build.sbt b/libtuf/build.sbt index 05e5019e..f7dcb016 100644 --- a/libtuf/build.sbt +++ b/libtuf/build.sbt @@ -9,7 +9,7 @@ libraryDependencies ++= { "com.softwaremill.sttp.client" %% "slf4j-backend" % "2.3.0", "com.softwaremill.sttp.client" %% "async-http-client-backend-future" % "2.3.0", "org.slf4j" % "slf4j-api" % "1.7.16" % "provided", - "com.azure" % "azure-storage-blob" % "12.23.0", - "com.azure" % "azure-identity" % "1.10.0" + "com.azure" % "azure-storage-blob" % "12.24.0", + "com.azure" % "azure-identity" % "1.10.1" ) } diff --git a/project/CustomSettings.scala b/project/CustomSettings.scala deleted file mode 100644 index 3c5894e4..00000000 --- a/project/CustomSettings.scala +++ /dev/null @@ -1,5 +0,0 @@ -import sbt.settingKey - -object CustomSettings { - val libatsVersion = settingKey[String]("libats version") -} diff --git a/project/build.properties b/project/build.properties index e74787a9..5d14bd1f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,3 +1,3 @@ -sbt.version=1.9.3 +sbt.version=1.9.6 diff --git a/project/build.sbt b/project/build.sbt index b9195a24..3b5f519a 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,5 +1,5 @@ -libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.533" +libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.565" -libraryDependencies += "org.apache.commons" % "commons-compress" % "1.23.0" +libraryDependencies += "org.apache.commons" % "commons-compress" % "1.24.0" diff --git a/project/plugins.sbt b/project/plugins.sbt index 2c090e42..7b2c9f64 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.11") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")