Skip to content

Commit c780165

Browse files
authored
Merge pull request #603 from scala-steward/update/libats-2.4.0
Update libats, libats-http, ... to 2.4.0
2 parents 8bcd200 + 13935cb commit c780165

File tree

2 files changed

+12
-19
lines changed

2 files changed

+12
-19
lines changed

build.sbt

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import CustomSettings._
21

32
def itFilter(name: String): Boolean = name endsWith "IntegrationSpec"
43

@@ -10,24 +9,24 @@ lazy val UnitTest = config("ut").extend(Test)
109

1110
lazy val commonConfigs = Seq(ItTest, UnitTest)
1211

12+
val libatsVersion = "2.4.1"
13+
1314
lazy val commonDeps = libraryDependencies ++= {
1415
val scalaTestV = "3.2.17"
15-
lazy val libatsV = libatsVersion.value
1616
lazy val catsV = "2.10.0"
1717

1818
Seq(
1919
"org.scala-lang.modules" %% "scala-async" % "1.0.1",
2020
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
21-
"io.github.uptane" %% "libats" % libatsV,
21+
"io.github.uptane" %% "libats" % libatsVersion,
2222
"org.scalatest" %% "scalatest" % scalaTestV % "test",
2323
"org.typelevel" %% "cats-core" % catsV,
2424
)
2525
}
2626

2727
lazy val serverDependencies = libraryDependencies ++= {
28-
lazy val akkaV = "2.6.20"
29-
lazy val akkaHttpV = "10.2.10"
30-
lazy val libatsV = libatsVersion.value
28+
lazy val akkaV = "2.8.5"
29+
lazy val akkaHttpV = "10.5.2"
3130

3231
Seq(
3332
"com.typesafe.akka" %% "akka-actor" % akkaV,
@@ -38,13 +37,13 @@ lazy val serverDependencies = libraryDependencies ++= {
3837
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV % "test",
3938
"com.softwaremill.sttp.client" %% "akka-http-backend" % "2.3.0" % "test",
4039

41-
"io.github.uptane" %% "libats-http" % libatsV,
42-
"io.github.uptane" %% "libats-http-tracing" % libatsV,
43-
"io.github.uptane" %% "libats-messaging" % libatsV,
44-
"io.github.uptane" %% "libats-metrics-akka" % libatsV,
45-
"io.github.uptane" %% "libats-metrics-prometheus" % libatsV,
46-
"io.github.uptane" %% "libats-slick" % libatsV,
47-
"io.github.uptane" %% "libats-logging" % libatsV,
40+
"io.github.uptane" %% "libats-http" % libatsVersion,
41+
"io.github.uptane" %% "libats-http-tracing" % libatsVersion,
42+
"io.github.uptane" %% "libats-messaging" % libatsVersion,
43+
"io.github.uptane" %% "libats-metrics-akka" % libatsVersion,
44+
"io.github.uptane" %% "libats-metrics-prometheus" % libatsVersion,
45+
"io.github.uptane" %% "libats-slick" % libatsVersion,
46+
"io.github.uptane" %% "libats-logging" % libatsVersion,
4847
"org.mariadb.jdbc" % "mariadb-java-client" % "3.2.0"
4948
)
5049
}
@@ -59,7 +58,6 @@ lazy val commonSettings = Seq(
5958
Compile / console / scalacOptions ~= (_.filterNot(_ == "-Ywarn-unused-import")),
6059
resolvers += "sonatype-snapshots" at "https://s01.oss.sonatype.org/content/repositories/snapshots",
6160
resolvers += "sonatype-releases" at "https://s01.oss.sonatype.org/content/repositories/releases",
62-
libatsVersion := "2.3.1",
6361
licenses += ("MPL-2.0", url("http://mozilla.org/MPL/2.0/")),
6462
description := "scala tuf implementation support",
6563
buildInfoOptions += BuildInfoOption.ToMap,

project/CustomSettings.scala

-5
This file was deleted.

0 commit comments

Comments
 (0)