build: Build gardening

build.sbt

@@ -1,9 +1,7 @@
 import akka._
-import akka.ValidatePullRequest._
 import AkkaDependency._
 import Dependencies.{h2specExe, h2specName}
-import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
-import com.typesafe.sbt.SbtScalariform.ScalariformKeys
+import com.typesafe.sbt.MultiJvmPlugin.autoImport.MultiJvm
 import java.nio.file.Files
 import java.nio.file.attribute.{PosixFileAttributeView, PosixFilePermission}
 
@@ -51,9 +49,7 @@ inThisBuild(Def.settings(
   onLoad in Global := {
     sLog.value.info(s"Building Akka HTTP ${version.value} against Akka ${AkkaDependency.akkaVersion} on Scala ${(httpCore / scalaVersion).value}")
     (onLoad in Global).value
-  },
-
-  scalafixScalaBinaryVersion := scalaBinaryVersion.value,
+  }
 ))
 
 // When this is updated the set of modules in Http.allModules should also be updated
@@ -83,7 +79,7 @@ lazy val root = Project(
     id = "akka-http-root",
     base = file(".")
   )
-  .enablePlugins(UnidocRoot, NoPublish, PublishRsyncPlugin, AggregatePRValidation, NoScala3)
+  .enablePlugins(UnidocRoot, NoPublish, PublishRsyncPlugin, NoScala3)
   .disablePlugins(
     MimaPlugin,
     com.geirsson.CiReleasePlugin) // we use publishSigned, but use a pgp utility from CiReleasePlugin
@@ -276,7 +272,7 @@ lazy val httpTests = project("akka-http-tests")
   .disablePlugins(MimaPlugin) // this is only tests
   .configs(MultiJvm)
   .settings(headerSettings(MultiJvm))
-  .settings(ValidatePR / additionalTasks += MultiJvm / headerCheck)
+  .settings(AkkaHttpValidatePullRequest.additionalTasks += MultiJvm / headerCheck)
   .addAkkaModuleDependency("akka-stream", "provided")
   .addAkkaModuleDependency("akka-multi-node-testkit", "test")
   .settings(
@@ -515,7 +511,6 @@ lazy val docs = project("docs")
     ),
     apidocRootPackage := "akka",
     Formatting.docFormatSettings,
-    ValidatePR / additionalTasks ++= Seq(Compile / paradox),
     ThisBuild / publishRsyncHost := "akkarepo@gustav.akka.io",
     publishRsyncArtifacts := List((Compile / paradox).value -> gustavDir("docs").value),
   )

project/CopyrightHeader.scala

@@ -4,12 +4,13 @@
 
 package akka
 
-import sbt._, Keys._
-import de.heikoseeberger.sbtheader.{ CommentCreator, HeaderPlugin }
+import sbt.*
+import Keys.*
+import de.heikoseeberger.sbtheader.{CommentCreator, HeaderPlugin}
 
 object CopyrightHeader extends AutoPlugin {
   import HeaderPlugin.autoImport._
-  import ValidatePullRequest.{ additionalTasks, ValidatePR }
+  import akka.AkkaHttpValidatePullRequest.additionalTasks
 
   override def requires = HeaderPlugin
   override def trigger = allRequirements
@@ -27,8 +28,7 @@ object CopyrightHeader extends AutoPlugin {
         )
       )
     },
-    ValidatePR / additionalTasks += Compile / headerCheck,
-    ValidatePR / additionalTasks += Test / headerCheck
+    Def.settings(additionalTasks += Compile / headerCheck, additionalTasks += Test / headerCheck),
   )
 
   // We hard-code this so PR's created in year X will not suddenly in X+1.

project/Formatting.scala

@@ -5,7 +5,7 @@
 package akka
 
 import sbt._
-import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
+import com.typesafe.sbt.MultiJvmPlugin.autoImport.MultiJvm
 import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 
 object Formatting {

project/Github.scala

@@ -6,9 +6,15 @@ package akka
 
 object GitHub {
 
-  def envTokenOrThrow: String =
-    System.getenv("PR_VALIDATOR_GH_TOKEN")
-      .ensuring(_ != null, "No PR_VALIDATOR_GH_TOKEN env var provided, unable to reach github!")
+  def envTokenOrThrow: Option[String] =
+    sys.env.get("PR_VALIDATOR_GH_TOKEN").orElse {
+      if (sys.env.contains("ghprbPullId")) {
+        throw new Exception(
+          "No PR_VALIDATOR_GH_TOKEN env var provided during GitHub Pull Request Builder build, unable to reach GitHub!")
+      } else {
+        None
+      }
+    }
 
   def url(v: String, isSnapshot: Boolean): String = {
     val branch = if (isSnapshot) "main" else "v" + v

project/MultiNode.scala

@@ -4,8 +4,9 @@
 
 package akka
 
-import com.typesafe.sbt.{SbtMultiJvm, SbtScalariform}
-import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys._
+import com.typesafe.sbt.SbtScalariform
+import com.typesafe.sbt.MultiJvmPlugin
+import com.typesafe.sbt.MultiJvmPlugin.autoImport._
 import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 import sbt._
 import sbt.Keys._
@@ -49,7 +50,7 @@ object MultiNode extends AutoPlugin {
   }
 
   private val multiJvmSettings =
-    SbtMultiJvm.multiJvmSettings ++
+    MultiJvmPlugin.multiJvmSettings ++
     inConfig(MultiJvm)(SbtScalariform.configScalariformSettings) ++
     Seq(
       MultiJvm / jvmOptions := defaultMultiJvmOptions,