Move native linking v0.4/5 tests from bridge to frontend

scalacenter · Dec 19, 2024 · e6722cf · e6722cf
1 parent 7985bda
commit e6722cf
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 212 deletions.
diff --git a/...ges/scala-native-0.4-test/src/test/scala/bloop/scalanative/ScalaNativeToolchainSpec.scala b/...ges/scala-native-0.4-test/src/test/scala/bloop/scalanative/ScalaNativeToolchainSpec.scala
diff --git a/...ges/scala-native-0.5-test/src/test/scala/bloop/scalanative/ScalaNativeToolchainSpec.scala b/...ges/scala-native-0.5-test/src/test/scala/bloop/scalanative/ScalaNativeToolchainSpec.scala
diff --git a/build.sbt b/build.sbt
@@ -186,6 +186,7 @@ lazy val frontend: Project = project
       (sbtBloop / Keys.publishLocal).value
       (jsBridge1 / Keys.publishLocal).value
       (nativeBridge05 / Keys.publishLocal).value
+      (nativeBridge04 / Keys.publishLocal).value
       val additionalResources =
         BuildDefaults.exportProjectsInTestResources(dir, log.log, enableCache = true, version.value)
       main ++ additionalResources
@@ -422,18 +423,6 @@ lazy val nativeBridge05 = project
     (Test / fork) := true
   )
 
-lazy val nativeBridge05Test = project
-  .dependsOn(bloopShared % Provided)
-  .dependsOn(nativeBridge05 % Provided, frontend % "test->test")
-  .in(file("bridges") / "scala-native-0.5-test")
-  .disablePlugins(ScalafixPlugin, ScriptedPlugin)
-  .settings(
-    name := s"$nativeBridge05Name-test",
-    testSettings,
-    (Test / javaOptions) ++= jvmOptions,
-    (Test / fork) := true
-  )
-
 val allProjects = Seq(
   backend,
   benchmarks,

diff --git a/frontend/src/main/scala/bloop/engine/tasks/toolchains/ScalaNativeToolchain.scala b/frontend/src/main/scala/bloop/engine/tasks/toolchains/ScalaNativeToolchain.scala
@@ -72,7 +72,7 @@ final class ScalaNativeToolchain private (classLoader: ClassLoader) {
     } else {
       Task {
         nativeLinkMeth
-          .invoke(null, config, project, fullClasspath, fullEntry, target.underlying, logger)
+          .invoke(null, config, workdir, fullClasspath, fullEntry, target.underlying, logger)
           .asInstanceOf[Unit]
       }.materialize
     }