From 7cdca36ab8c5679780749e52e5cf0a08ec927f80 Mon Sep 17 00:00:00 2001
From: Marcos Pereira <marcos.silva@gmail.com>
Date: Thu, 19 Aug 2021 20:03:07 -0400
Subject: [PATCH] Some minor build clean ups

- Resolve some warnings due to depracations
- Fix an infinite recursion
- Minor refactoring to use sys.props instead of System.getProperty
---
 build.sbt               | 2 +-
 project/AkkaBuild.scala | 6 +++---
 project/MultiNode.scala | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.sbt b/build.sbt
index 4cad547b08..10d18066e3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -360,7 +360,7 @@ lazy val protobufV3 = akkaModule("akka-protobuf-v3")
           // https://github.com/sbt/sbt-assembly/issues/400
           .inLibrary(Dependencies.Compile.Provided.protobufRuntime)
           .inProject),
-    assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeScala = false, includeBin = false),
+    assembly / assemblyOption := (assembly / assemblyOption).value.withIncludeScala(false).withIncludeBin(false),
     autoScalaLibrary := false, // do not include scala dependency in pom
     exportJars := true, // in dependent projects, use assembled and shaded jar
     makePomConfiguration := makePomConfiguration.value
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 722aaf5d3d..73518eb802 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -132,8 +132,8 @@ object AkkaBuild {
     crossVersion := CrossVersion.binary,
     // Adds a `src/main/scala-2.13+` source directory for code shared
     // between Scala 2.13 and Scala 3
-    unmanagedSourceDirectories in Compile ++= {
-      val sourceDir = (sourceDirectory in Compile).value
+    Compile / unmanagedSourceDirectories ++= {
+      val sourceDir = (Compile / sourceDirectory).value
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((3, n))            => Seq(sourceDir / "scala-2.13+")
         case Some((2, n)) if n >= 13 => Seq(sourceDir / "scala-2.13+")
@@ -213,7 +213,7 @@ object AkkaBuild {
         group.runPolicy match {
           case Tests.SubProcess(forkOptions) =>
             // format: off
-            group.copy(runPolicy = Tests.SubProcess(
+            group.withRunPolicy(Tests.SubProcess(
               forkOptions.withWorkingDirectory(workingDirectory = Some(new File(System.getProperty("user.dir"))))))
             // format: on
           case _ => group
diff --git a/project/MultiNode.scala b/project/MultiNode.scala
index 0493cd6e93..293a2da54c 100644
--- a/project/MultiNode.scala
+++ b/project/MultiNode.scala
@@ -24,8 +24,7 @@ object MultiNode extends AutoPlugin {
 
   // MultiJvm tests can be excluded from normal test target an validatePullRequest
   // with -Dakka.test.multi-in-test=false
-  val multiNodeTestInTest: Boolean =
-    System.getProperty("akka.test.multi-in-test", "true") == "true"
+  val multiNodeTestInTest: Boolean = sys.props.getOrElse("akka.test.multi-in-test", "true").toBoolean
 
   object CliOptions {
     val multiNode = CliOption("akka.test.multi-node", false)
@@ -85,7 +84,7 @@ object MultiNode extends AutoPlugin {
         (name: String) =>
           new Logger {
             def trace(t: => Throwable): Unit = { logger.trace(t) }
-            def success(message: => String): Unit = { success(message) }
+            def success(message: => String): Unit = { logger.success(message) }
             def log(level: Level.Value, message: => String): Unit =
               logger.log(level, s"[${scala.Console.BLUE}$name${scala.Console.RESET}] $message")
           }