Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor/Patch Updates #48

Merged
merged 5 commits into from
Nov 24, 2023
Merged

Minor/Patch Updates #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
254a416
Update log4j-api to 2.22.0
Nov 20, 2023
fcd50dc
Update scalafmt-core to 3.7.17
Nov 20, 2023
dec8338
Update sbt-sonatype to 3.10.0
Nov 20, 2023
afddb88
Merge branch 'pekko' into update/minor_patch
saeltz Nov 24, 2023
ac11068
Use log4j-slf4j2-impl
saeltz Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
132 changes: 62 additions & 70 deletions build.sbt
View file
Open in desktop
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.21.1"
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
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Loading