Skip to content

Commit

Permalink
Use log4j-slf4j2-impl
Browse files Browse the repository at this point in the history
  • Loading branch information
@saeltz
saeltz committed Nov 24, 2023
1 parent afddb88 commit ac11068
Showing 1 changed file with 62 additions and 70 deletions.
132 changes: 62 additions & 70 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ lazy val itkit =
name := "itkit-pekko",
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-pekko"), "scm:git@github.com:moia-oss/itkit-pekko.git")),
homepage := Some(url("https://github.com/moia-oss/itkit-pekko"))
scmInfo := Some(ScmInfo(url("https://github.com/moia-oss/itkit-pekko"), "scm:git@github.com:moia-oss/itkit-pekko.git")),
homepage := Some(url("https://github.com/moia-oss/itkit-pekko"))
)
.enablePlugins(
AutomateHeaderPlugin,
Expand Down Expand Up @@ -52,7 +52,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,
Expand All @@ -64,31 +64,30 @@ lazy val IntegrationTestConfig =
// Dependencies
// *****************************************************************************

lazy val library =
new {
object Version {
val pekko = "1.0.1"
val pekkoHttp = "1.0.0"
val log4j = "2.22.0"
val pureConfig = "0.17.4"
val scalaCheck = "1.17.0"
val scalaLogging = "3.9.5"
val scalaTest = "3.2.17"
}
val pekkoActor = "org.apache.pekko" %% "pekko-actor-typed" % Version.pekko
val pekkoHttp = "org.apache.pekko" %% "pekko-http" % Version.pekkoHttp
val pekkoHttpTestkit = "org.apache.pekko" %% "pekko-http-testkit" % Version.pekkoHttp
val pekkoStream = "org.apache.pekko" %% "pekko-stream-typed" % Version.pekko
val pekkoActorTestkit = "org.apache.pekko" %% "pekko-actor-testkit-typed" % Version.pekko
val log4jApi = "org.apache.logging.log4j" % "log4j-api" % Version.log4j
val log4jCore = "org.apache.logging.log4j" % "log4j-core" % Version.log4j
val logJulOverLog4j = "org.apache.logging.log4j" % "log4j-jul" % Version.log4j
val logSlfOverLog4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % Version.log4j
val pureConfig = "com.github.pureconfig" %% "pureconfig" % Version.pureConfig
val scalaCheck = "org.scalacheck" %% "scalacheck" % Version.scalaCheck
val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % Version.scalaLogging
val scalaTest = "org.scalatest" %% "scalatest" % Version.scalaTest
lazy val library = new {
object Version {
val pekko = "1.0.1"
val pekkoHttp = "1.0.0"
val log4j = "2.22.0"
val pureConfig = "0.17.4"
val scalaCheck = "1.17.0"
val scalaLogging = "3.9.5"
val scalaTest = "3.2.17"
}
val pekkoActor = "org.apache.pekko" %% "pekko-actor-typed" % Version.pekko
val pekkoHttp = "org.apache.pekko" %% "pekko-http" % Version.pekkoHttp
val pekkoHttpTestkit = "org.apache.pekko" %% "pekko-http-testkit" % Version.pekkoHttp
val pekkoStream = "org.apache.pekko" %% "pekko-stream-typed" % Version.pekko
val pekkoActorTestkit = "org.apache.pekko" %% "pekko-actor-testkit-typed" % Version.pekko
val log4jApi = "org.apache.logging.log4j" % "log4j-api" % Version.log4j
val log4jCore = "org.apache.logging.log4j" % "log4j-core" % Version.log4j
val logJulOverLog4j = "org.apache.logging.log4j" % "log4j-jul" % Version.log4j
val logSlfOverLog4j = "org.apache.logging.log4j" % "log4j-slf4j2-impl" % Version.log4j
val pureConfig = "com.github.pureconfig" %% "pureconfig" % Version.pureConfig
val scalaCheck = "org.scalacheck" %% "scalacheck" % Version.scalaCheck
val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % Version.scalaLogging
val scalaTest = "org.scalatest" %% "scalatest" % Version.scalaTest
}

// *****************************************************************************
// Settings
Expand All @@ -103,49 +102,42 @@ lazy val commonSettings =
scapegoatSettings ++
sbtGitSettings

lazy val compilerSettings =
Seq(
scalaVersion := "2.13.12",
versionScheme := Some("early-semver"),
Compile / packageBin / mappings += baseDirectory.value / "LICENSE" -> "LICENSE",
scalacOptions ++= Seq(
"-unchecked",
"-deprecation",
"-language:_",
"-release",
"8",
"-encoding",
"UTF-8",
"-DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector",
"-Xfatal-warnings",
"-Xlint:_,-byname-implicit",
"-Ywarn-numeric-widen",
"-Ywarn-dead-code",
"-Ywarn-value-discard",
"-Xsource:3"
),
javacOptions ++= Seq(
"-source",
"1.8",
"-target",
"1.8"
),
Compile / unmanagedSourceDirectories := Seq((Compile / scalaSource).value),
Test / unmanagedSourceDirectories := Seq((Test / scalaSource).value)
)
lazy val compilerSettings = Seq(
scalaVersion := "2.13.12",
versionScheme := Some("early-semver"),
Compile / packageBin / mappings += baseDirectory.value / "LICENSE" -> "LICENSE",
scalacOptions ++= Seq(
"-unchecked",
"-deprecation",
"-language:_",
"-release",
"8",
"-encoding",
"UTF-8",
"-DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector",
"-Xfatal-warnings",
"-Xlint:_,-byname-implicit",
"-Ywarn-numeric-widen",
"-Ywarn-dead-code",
"-Ywarn-value-discard",
"-Xsource:3"
),
javacOptions ++= Seq(
"-source",
"1.8",
"-target",
"1.8"
),
Compile / unmanagedSourceDirectories := Seq((Compile / scalaSource).value),
Test / unmanagedSourceDirectories := Seq((Test / scalaSource).value)
)

lazy val gitSettings = Seq(git.useGitDescribe := true)

lazy val licenseSettings =
Seq(
headerLicense := Some(
HeaderLicense.Custom(
"""|Copyright (c) MOIA GmbH 2017
|""".stripMargin
)
),
headerMappings := headerMappings.value + (HeaderFileType.conf -> HeaderCommentStyle.hashLineComment)
)
lazy val licenseSettings = Seq(
headerLicense := Some(HeaderLicense.Custom("Copyright (c) MOIA GmbH 2017")),
headerMappings := headerMappings.value + (HeaderFileType.conf -> HeaderCommentStyle.hashLineComment)
)

lazy val sonatypeSettings = {
import xerial.sbt.Sonatype._
Expand All @@ -167,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")
Expand Down

0 comments on commit ac11068

Please sign in to comment.