diff --git a/build.sbt b/build.sbt index 2bb173d..e08d1db 100644 --- a/build.sbt +++ b/build.sbt @@ -9,8 +9,8 @@ lazy val itkit = name := "itkit", organization := "io.moia", licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")), - scmInfo := Some(ScmInfo(url("https://github.com/moia-oss/itkit"), "scm:git@github.com:moia-oss/itkit.git")), - homepage := Some(url("https://github.com/moia-oss/itkit")) + scmInfo := Some(ScmInfo(url("https://github.com/moia-oss/itkit"), "scm:git@github.com:moia-oss/itkit.git")), + homepage := Some(url("https://github.com/moia-oss/itkit")) ) .enablePlugins( AutomateHeaderPlugin, @@ -51,7 +51,7 @@ lazy val samples = lazy val IntegrationWithTest = config("it").extend(Test) lazy val integrationTestSettings = inConfig(IntegrationWithTest)(integrationTestConfig) -lazy val integrationTestConfig = +lazy val integrationTestConfig = Defaults.configSettings ++ Defaults.testTasks ++ org.scalafmt.sbt.ScalafmtPlugin.scalafmtConfigSettings ++ Seq( IntegrationWithTest / publish / skip := true, IntegrationWithTest / fork := true, @@ -67,13 +67,13 @@ lazy val library = new { object Version { val akka = "2.6.20" val akkaHttp = "10.2.10" - val log4j = "2.22.0" + val log4j = "2.22.1" val pureConfig = "0.17.4" val scalaCheck = "1.17.0" val scalaLogging = "3.9.5" val scalaTest = "3.2.17" } - val akkaActor = "com.typesafe.akka" %% "akka-actor-typed" % Version.akka + val akkaActor = "com.typesafe.akka" %% "akka-actor-typed" % Version.akka val akkaHttp = "com.typesafe.akka" %% "akka-http" % Version.akkaHttp val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % Version.akkaHttp val akkaStream = "com.typesafe.akka" %% "akka-stream-typed" % Version.akka @@ -128,8 +128,8 @@ lazy val compilerSettings = Seq( "-target", "1.8" ), - Compile / unmanagedSourceDirectories := Seq((Compile / scalaSource).value), - Test / unmanagedSourceDirectories := Seq((Test / scalaSource).value) + Compile / unmanagedSourceDirectories := Seq((Compile / scalaSource).value), + Test / unmanagedSourceDirectories := Seq((Test / scalaSource).value) ) lazy val gitSettings = Seq(git.useGitDescribe := true) @@ -159,9 +159,9 @@ lazy val scapegoatSettings = Seq(ThisBuild / scapegoatVersion := "2.1.3") lazy val sbtVersionRegex = "v([0-9]+.[0-9]+.[0-9]+)-?(.*)?".r lazy val sbtGitSettings = Seq( - git.useGitDescribe := true, - git.baseVersion := "0.0.0", - git.uncommittedSignifier := None, + git.useGitDescribe := true, + git.baseVersion := "0.0.0", + git.uncommittedSignifier := None, git.gitTagToVersionNumber := { case sbtVersionRegex(v, "") => Some(v) case sbtVersionRegex(v, "SNAPSHOT") => Some(s"$v-SNAPSHOT")