From eb155adcd739d7fda7ea9d5a0f4977aa3a2a0320 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 29 Nov 2023 18:31:59 +0000 Subject: [PATCH] Update logback-classic to 1.4.13 --- build.sbt | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index 22e2f93..e09b405 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ -val Http4sVersion = "1.0.0-M38" -val Http4sScalaXmlVersion = Http4sVersion + ".1" -val Specs2Version = "5.0.7" +val Http4sVersion = "1.0.0-M38" +val Http4sScalaXmlVersion = Http4sVersion + ".1" +val Specs2Version = "5.0.7" val CatsEffectTestingSpecs2Version = "1.5.0" -val LogbackVersion = "1.4.11" -val JAnsiVersion = "2.4.0" +val LogbackVersion = "1.4.13" +val JAnsiVersion = "2.4.0" lazy val root = (project in file(".")) .settings( @@ -12,13 +12,13 @@ lazy val root = (project in file(".")) version := "0.0.4-SNAPSHOT", scalaVersion := "3.3.0", libraryDependencies ++= Seq( - "org.http4s" %% "http4s-blaze-server" % Http4sVersion, - "org.http4s" %% "http4s-blaze-client" % Http4sVersion, - "org.http4s" %% "http4s-dsl" % Http4sVersion, - "org.http4s" %% "http4s-scala-xml" % Http4sScalaXmlVersion, - "ch.qos.logback" % "logback-classic" % LogbackVersion, - "org.fusesource.jansi" % "jansi" % JAnsiVersion, - "org.typelevel" %% "cats-effect-testing-specs2" % CatsEffectTestingSpecs2Version % Test + "org.http4s" %% "http4s-blaze-server" % Http4sVersion, + "org.http4s" %% "http4s-blaze-client" % Http4sVersion, + "org.http4s" %% "http4s-dsl" % Http4sVersion, + "org.http4s" %% "http4s-scala-xml" % Http4sScalaXmlVersion, + "ch.qos.logback" % "logback-classic" % LogbackVersion, + "org.fusesource.jansi" % "jansi" % JAnsiVersion, + "org.typelevel" %% "cats-effect-testing-specs2" % CatsEffectTestingSpecs2Version % Test ), scalacOptions ++= Seq("@.scalacOptions.txt", "-Xfatal-warnings") ) @@ -28,12 +28,13 @@ assembly / mainClass := Some("edu.luc.etl.cs433.laufer.primenumbers.Main") enablePlugins(JavaAppPackaging) assembly / assemblyMergeStrategy := { - case "module-info.class" => MergeStrategy.discard + case "module-info.class" => MergeStrategy.discard case manifest if manifest.contains("MANIFEST.MF") => // We don't need manifest files since sbt-assembly will create // one with the given settings MergeStrategy.discard - case referenceOverrides if referenceOverrides.contains("reference-overrides.conf") => + case referenceOverrides + if referenceOverrides.contains("reference-overrides.conf") => // Keep the content for all reference-overrides.conf files MergeStrategy.concat case x =>