Pass JvmBuildTarget stuff to ScalaBuildTarget

com-lihaoyi · Oct 1, 2024 · d419c31 · d419c31
1 parent 57f8dbf
commit d419c31
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/bsp/worker/src/mill/bsp/worker/MillBuildServer.scala b/bsp/worker/src/mill/bsp/worker/MillBuildServer.scala
@@ -175,6 +175,8 @@ private class MillBuildServer(
             bsp4j.ScalaPlatform.forValue(d.platform.number),
             d.jars.asJava
           )
+          for (jvmBuildTarget <- d.jvmBuildTarget)
+            target.setJvmBuildTarget(MillBuildServer.jvmBuildTarget(jvmBuildTarget))
           Some((dataKind, target))
 
         case Some((dataKind, d: JvmBuildTarget)) =>

diff --git a/integration/ide/bsp-server/resources/fixtures/workspace-build-targets.json b/integration/ide/bsp-server/resources/fixtures/workspace-build-targets.json
@@ -60,7 +60,11 @@
           "file:///coursier-cache/https/repo1.maven.org/maven2/io/github/java-diff-utils/java-diff-utils/<java-diff-utils-version>/java-diff-utils-<java-diff-utils-version>.jar",
           "file:///coursier-cache/https/repo1.maven.org/maven2/org/jline/jline/<jline-version>/jline-<jline-version>.jar",
           "file:///coursier-cache/https/repo1.maven.org/maven2/net/java/dev/jna/jna/<jna-version>/jna-<jna-version>.jar"
-        ]
+        ],
+        "jvmBuildTarget": {
+          "javaHome": "file:///java-home/",
+          "javaVersion": "<java-version>"
+        }
       }
     },
     {
@@ -94,7 +98,11 @@
           "file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/<scala-version>/scala-compiler-<scala-version>.jar",
           "file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/<scala-version>/scala-reflect-<scala-version>.jar",
           "file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-library/<scala-version>/scala-library-<scala-version>.jar"
-        ]
+        ],
+        "jvmBuildTarget": {
+          "javaHome": "file:///java-home/",
+          "javaVersion": "<java-version>"
+        }
       }
     },
     {