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.

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

sbt 1.5.5 and plugin updates #2781

Merged
merged 2 commits into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ lazy val ftp = alpakkaProject(
Dependencies.Ftp,
Test / fork := true,
// To avoid potential blocking in machines with low entropy (default is `/dev/random`)
javaOptions in Test += "-Djava.security.egd=file:/dev/./urandom"
Test / javaOptions += "-Djava.security.egd=file:/dev/./urandom"
)

lazy val geode =
Expand All @@ -156,8 +156,8 @@ lazy val geode =
"geode",
Dependencies.Geode,
Test / fork := true,
unmanagedSourceDirectories in Compile ++= {
val sourceDir = (sourceDirectory in Compile).value
Compile / unmanagedSourceDirectories ++= {
val sourceDir = (Compile / sourceDirectory).value
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n >= 12 => Seq(sourceDir / "scala-2.12+")
case _ => Seq.empty
Expand Down Expand Up @@ -198,7 +198,7 @@ lazy val googleCloudPubSubGrpc = alpakkaProject(
akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Scala, AkkaGrpc.Java),
Compile / PB.protoSources += (Compile / PB.externalIncludePath).value,
// for the ExampleApp in the tests
connectInput in run := true,
run / connectInput := true,
Compile / scalacOptions ++= Seq(
"-P:silencer:pathFilters=akka-grpc/main",
"-P:silencer:pathFilters=akka-grpc/test"
Expand Down Expand Up @@ -235,7 +235,7 @@ lazy val jsonStreaming = alpakkaProject("json-streaming", "json.streaming", Depe

lazy val kinesis = alpakkaProject("kinesis", "aws.kinesis", Dependencies.Kinesis)

lazy val kudu = alpakkaProject("kudu", "kudu", Dependencies.Kudu, fork in Test := false)
lazy val kudu = alpakkaProject("kudu", "kudu", Dependencies.Kudu)

lazy val mongodb = alpakkaProject("mongodb", "mongodb", Dependencies.MongoDb)

Expand Down
2 changes: 1 addition & 1 deletion project/AutomaticModuleName.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ object AutomaticModuleName {
private val AutomaticModuleName = "Automatic-Module-Name"

def settings(name: String): Seq[Def.Setting[Task[Seq[PackageOption]]]] = Seq(
packageOptions in (Compile, packageBin) += Package.ManifestAttributes(AutomaticModuleName → name)
Compile / packageBin / packageOptions += Package.ManifestAttributes(AutomaticModuleName → name)
)
}
8 changes: 4 additions & 4 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ object Common extends AutoPlugin {
"-doc-version",
version.value,
"-sourcepath",
(baseDirectory in ThisBuild).value.toString,
(ThisBuild / baseDirectory).value.toString,
"-skip-packages",
"akka.pattern:" + // for some reason Scaladoc creates this
"org.mongodb.scala:" + // this one is a mystery as well
Expand Down Expand Up @@ -112,15 +112,15 @@ object Common extends AutoPlugin {
autoAPIMappings := true,
apiURL := Some(url(s"https://doc.akka.io/api/alpakka/${version.value}/akka/stream/alpakka/index.html")),
// show full stack traces and test case durations
testOptions in Test += Tests.Argument("-oDF"),
Test / testOptions += Tests.Argument("-oDF"),
// -a Show stack traces and exception class name for AssertionErrors.
// -v Log "test run started" / "test started" / "test run finished" events on log level "info" instead of "debug".
// -q Suppress stdout for successful tests.
testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "-q"),
Test / testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "-q"),
// By default scalatest futures time out in 150 ms, dilate that to 600ms.
// This should not impact the total test time as we don't expect to hit this
// timeout.
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-F", "4"),
Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-F", "4"),
scalafmtOnCompile := insideCI.value,
javafmtOnCompile := insideCI.value,
headerLicense := Some(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.4
sbt.version=1.5.5
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.6")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
// discipline
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.5.1")
// docs
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.37")
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.39")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
Expand Down