Merge branch 'main' into manage-test-dependencies

build.sc

@@ -1227,32 +1227,29 @@ object example extends MillScalaModule {
       case "javamodule" => scalamodule
     }
 
-    def buildScLines = T {
-      val upstreamLines = os.read.lines(
-        upstreamCross(this.millModuleSegments.parts.dropRight(1).last)(crossValue)
-          .testRepoRoot().path / "build.sc"
-      )
-      val lines = os.read.lines(testRepoRoot().path / "build.sc")
-
-      import collection.mutable
-      val groupedLines = mutable.Map.empty[String, mutable.Buffer[String]]
-      var current = Option.empty[String]
-      lines.foreach {
-        case s"//// SNIPPET:$name" =>
-          current = Some(name)
-          groupedLines(name) = mutable.Buffer()
-        case s => groupedLines(current.get).append(s)
-      }
-
-      upstreamLines.flatMap {
-        case s"//// SNIPPET:$name" =>
-          if (name != "END") {
+    def buildScLines =
+      upstreamCross(
+        this.millModuleSegments.parts.dropRight(1).last).valuesToModules.get(List(crossValue)
+      ) match {
+        case None =>
+          T {
+            super.buildScLines()
+          }
+        case Some(upstream) => T {
+          val upstreamLines = os.read.lines(
+            upstream
+              .testRepoRoot().path / "build.sc"
+          )
+          val lines = os.read.lines(testRepoRoot().path / "build.sc")
 
-            current = Some(name)
-            groupedLines(name)
-          } else {
-            current = None
-            Nil
+          import collection.mutable
+          val groupedLines = mutable.Map.empty[String, mutable.Buffer[String]]
+          var current = Option.empty[String]
+          lines.foreach {
+            case s"//// SNIPPET:$name" =>
+              current = Some(name)
+              groupedLines(name) = mutable.Buffer()
+            case s => groupedLines(current.get).append(s)
           }
 
           upstreamLines.flatMap {