From 85dd77758dd5d58d6338253172f06a52917fab99 Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:25:20 +0100 Subject: [PATCH 1/2] sbt 1.5.5 (and use slash syntax) --- build.sbt | 10 +++++----- project/AutomaticModuleName.scala | 2 +- project/Common.scala | 8 ++++---- project/build.properties | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.sbt b/build.sbt index 3a70e495bf..676ebe2777 100644 --- a/build.sbt +++ b/build.sbt @@ -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 = @@ -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 @@ -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" @@ -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) diff --git a/project/AutomaticModuleName.scala b/project/AutomaticModuleName.scala index d5ebcfbac8..0b4558832b 100644 --- a/project/AutomaticModuleName.scala +++ b/project/AutomaticModuleName.scala @@ -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) ) } diff --git a/project/Common.scala b/project/Common.scala index 73f4f4f93b..8fb2b3b0db 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -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 @@ -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( diff --git a/project/build.properties b/project/build.properties index 7de0a9382f..10fd9eee04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.5.5 From 183e01723865c6a39714d44a18a5ca896bfc637b Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Wed, 24 Nov 2021 09:52:34 +0100 Subject: [PATCH 2/2] sbt plugin updates --- project/plugins.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ac8ffcb18a..cdf35b566a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")