From 254a4164af52f0a5a60bca92cbb818ac5e745ec5 Mon Sep 17 00:00:00 2001 From: scala-steward <162267+scala-steward-for-moia[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:01:23 +0000 Subject: [PATCH 1/4] Update log4j-api to 2.22.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4897799..1ba82e9 100644 --- a/build.sbt +++ b/build.sbt @@ -69,7 +69,7 @@ lazy val library = object Version { val pekko = "1.0.1" val pekkoHttp = "1.0.0" - val log4j = "2.21.1" + val log4j = "2.22.0" val pureConfig = "0.17.4" val scalaCheck = "1.17.0" val scalaLogging = "3.9.5" From fcd50dcae0b61f8e6f50c60636aa91ec3b08cfe0 Mon Sep 17 00:00:00 2001 From: scala-steward <162267+scala-steward-for-moia[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:01:25 +0000 Subject: [PATCH 2/4] Update scalafmt-core to 3.7.17 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 187afb5..976124e 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,5 @@ # https://scalameta.org/scalafmt/docs/configuration.html -version = "3.7.15" +version = "3.7.17" runner.dialect = scala213source3 preset = defaultWithAlign align.preset = most From dec8338cd3423812bc90db865334182a9d62de76 Mon Sep 17 00:00:00 2001 From: scala-steward <162267+scala-steward-for-moia[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:01:30 +0000 Subject: [PATCH 3/4] Update sbt-sonatype to 3.10.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0fc0c34..465007f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -19,7 +19,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.2.2") // Publish to sonatype -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0") // publishSigned addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") From ac11068875502cade5af6945eb367f9963fd4ad6 Mon Sep 17 00:00:00 2001 From: saeltz Date: Fri, 24 Nov 2023 21:36:18 +0100 Subject: [PATCH 4/4] Use log4j-slf4j2-impl --- build.sbt | 132 +++++++++++++++++++++++++----------------------------- 1 file changed, 62 insertions(+), 70 deletions(-) diff --git a/build.sbt b/build.sbt index 1ba82e9..4e40a19 100644 --- a/build.sbt +++ b/build.sbt @@ -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, @@ -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, @@ -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 @@ -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._ @@ -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")