Add new mechanism for resolving scoped buildOptions (#2274)

Author: MaciejG604

modules/build/src/main/scala/scala/build/ScopedSources.scala

@@ -9,14 +9,20 @@ final case class ScopedSources(
   resourceDirs: Seq[HasScope[os.Path]],
   buildOptions: Seq[HasScope[BuildOptions]]
 ) {
+  def buildOptionsFor(scope: Scope): Seq[BuildOptions] =
+    scope match {
+      case Scope.Test => buildOptions.flatMap(_.valueFor(Scope.Test).toSeq) ++
+          buildOptions.flatMap(_.valueFor(Scope.Main).toSeq)
+      case _ => buildOptions.flatMap(_.valueFor(scope).toSeq)
+    }
+
   def sources(scope: Scope, baseOptions: BuildOptions): Sources =
     Sources(
       paths.flatMap(_.valueFor(scope).toSeq),
       inMemory.flatMap(_.valueFor(scope).toSeq),
       defaultMainClass,
       resourceDirs.flatMap(_.valueFor(scope).toSeq),
-      buildOptions
-        .flatMap(_.valueFor(scope).toSeq)
+      buildOptionsFor(scope)
         .foldRight(baseOptions)(_ orElse _)
     )
 }

modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala

@@ -4,7 +4,14 @@ import com.eed3si9n.expecty.Expecty.expect
 
 import java.io.IOException
 import scala.build.{Build, BuildThreads, Directories, LocalRepo, Position, Positioned}
-import scala.build.options.{BuildOptions, InternalOptions, MaybeScalaVersion, ScalacOpt, Scope}
+import scala.build.options.{
+  BuildOptions,
+  InternalOptions,
+  MaybeScalaVersion,
+  ScalaOptions,
+  ScalacOpt,
+  Scope
+}
 import scala.build.tests.util.BloopServer
 import build.Ops.EitherThrowOps
 import dependency.AnyDependency
@@ -472,4 +479,25 @@ class DirectiveTests extends munit.FunSuite {
         }
     }
   }
+
+  test("main scope dependencies propagate to test scope") {
+    val Scala322Options = baseOptions.copy(scalaOptions =
+      ScalaOptions(
+        scalaVersion = Some(MaybeScalaVersion("3.2.2"))
+      )
+    )
+
+    val testInputs = TestInputs(
+      os.rel / "simple.sc" ->
+        """//> using target.scala 3.2.2
+          |//> using dep com.lihaoyi::os-lib:0.9.1
+          |""".stripMargin,
+      os.rel / "test" / "test.sc" ->
+        """println(os.list(os.pwd))
+          |""".stripMargin
+    )
+    testInputs.withBuild(Scala322Options, buildThreads, bloopConfigOpt, scope = Scope.Test) {
+      (root, _, maybeBuild) => expect(maybeBuild.exists(_.success))
+    }
+  }
 }