Merge branch 'main' into update/slf4j-api-2.0.16

lightbend-labs · Sep 18, 2024 · 41eed62 · 41eed62
2 parents 7e491cc + 2cb2d34
commit 41eed62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -28,7 +28,7 @@ lazy val core = project.in(file("core"))
       "com.h2database" % "h2" % "2.2.224" % "optional",
       "com.typesafe" % "config" % "1.4.3",
       "org.slf4j" % "slf4j-api" % "2.0.16",
-      "ch.qos.logback" % "logback-classic" % "1.5.6",
+      "ch.qos.logback" % "logback-classic" % "1.5.8",
       "com.github.sbt" % "junit-interface" % "0.13.3" % "test"
     ),
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"),
@@ -42,7 +42,7 @@ lazy val plugin = project.in(file("plugin"))
   .settings(
     name := "sbt-benchdb",
     sbtPlugin := true,
-    scalaVersion := "2.12.19",
+    scalaVersion := "2.12.20",
     buildInfoKeys := Seq[BuildInfoKey](organization, core / name, version, core / scalaVersion),
     buildInfoPackage := "com.lightbend.benchdb.sbtplugin",
     publishMavenStyle := false,

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.2