Move DirectiveUtils to the directives module

Author: Gedochao

modules/build/src/main/scala/scala/build/preprocessing/DirectivesPreprocessor.scala

@@ -23,7 +23,7 @@ import scala.build.options.{
   SuppressWarningOptions,
   WithBuildRequirements
 }
-import scala.build.preprocessing.directives.DirectivesPreprocessingUtils.*
+import scala.build.preprocessing.directives.Directives.*
 import scala.build.preprocessing.directives.PartiallyProcessedDirectives.*
 import scala.build.preprocessing.directives.*
 

modules/cli/src/main/scala/scala/cli/commands/fix/BuiltInRules.scala

@@ -20,12 +20,12 @@ import scala.collection.immutable.HashMap
 import scala.util.chaining.scalaUtilChainingOps
 
 object BuiltInRules extends CommandHelpers {
-  private lazy val targetDirectivesKeysSet = DirectivesPreprocessingUtils.requireDirectiveHandlers
+  private lazy val targetDirectivesKeysSet = Directives.requireDirectiveHandlers
     .flatMap(_.keys.flatMap(_.nameAliases)).toSet
-  private lazy val usingDirectivesKeysGrouped = DirectivesPreprocessingUtils.usingDirectiveHandlers
+  private lazy val usingDirectivesKeysGrouped = Directives.usingDirectiveHandlers
     .flatMap(_.keys)
   private lazy val usingDirectivesWithTestPrefixKeysGrouped =
-    DirectivesPreprocessingUtils.usingDirectiveWithReqsHandlers
+    Directives.usingDirectiveWithReqsHandlers
       .flatMap(_.keys)
 
   private lazy val directiveTestPrefix = "test."

modules/build/src/main/scala/scala/build/preprocessing/directives/DirectivesPreprocessingUtils.scala renamed to modules/directives/src/main/scala/scala/build/preprocessing/directives/Directives.scala

@@ -5,13 +5,12 @@ import scala.build.directives.{
   HasBuildOptionsWithRequirements,
   HasBuildRequirements
 }
-import scala.build.errors.{BuildException, UnusedDirectiveError}
 import scala.build.options.{BuildOptions, BuildRequirements, WithBuildRequirements}
 import scala.build.preprocessing.directives
 
-object DirectivesPreprocessingUtils {
+object Directives {
   val usingDirectiveHandlers: Seq[DirectiveHandler[BuildOptions]] =
-    Seq[DirectiveHandler[_ <: HasBuildOptions]](
+    Seq[DirectiveHandler[? <: HasBuildOptions]](
       directives.Benchmarking.handler,
       directives.BuildInfo.handler,
       directives.ComputeVersion.handler,
@@ -37,7 +36,7 @@ object DirectivesPreprocessingUtils {
 
   val usingDirectiveWithReqsHandlers
     : Seq[DirectiveHandler[List[WithBuildRequirements[BuildOptions]]]] =
-    Seq[DirectiveHandler[_ <: HasBuildOptionsWithRequirements]](
+    Seq[DirectiveHandler[? <: HasBuildOptionsWithRequirements]](
       directives.CustomJar.handler,
       directives.Dependency.handler,
       directives.JavaOptions.handler,
@@ -49,7 +48,7 @@ object DirectivesPreprocessingUtils {
     ).map(_.mapE(_.buildOptionsWithRequirements))
 
   val requireDirectiveHandlers: Seq[DirectiveHandler[BuildRequirements]] =
-    Seq[DirectiveHandler[_ <: HasBuildRequirements]](
+    Seq[DirectiveHandler[? <: HasBuildRequirements]](
       directives.RequirePlatform.handler,
       directives.RequireScalaVersion.handler,
       directives.RequireScalaVersionBounds.handler,

modules/generate-reference-doc/src/main/scala/scala/cli/doc/GenerateReferenceDoc.scala

@@ -16,7 +16,7 @@ import scala.build.internal.Constants
 import scala.build.internals.EnvVar
 import scala.build.options.{BuildOptions, BuildRequirements, WithBuildRequirements}
 import scala.build.preprocessing.directives.DirectiveHandler
-import scala.build.preprocessing.directives.DirectivesPreprocessingUtils.*
+import scala.build.preprocessing.directives.Directives.*
 import scala.cli.commands.{ScalaCommand, SpecificationLevel, tags}
 import scala.cli.doc.ReferenceDocUtils.*
 import scala.cli.util.ArgHelpers.*