Merge pull request #2199 from tgodzik/avoid-fullclasspath

bugfix: Don't use fullclasspath in sbt plugin

integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala

@@ -788,7 +788,8 @@ object BloopDefaults {
         val isForkedExecution = (Keys.fork in configuration in forkScopedTask).value
         val workingDir = if (isForkedExecution) Keys.baseDirectory.value else rootBaseDirectory
         val extraJavaOptions = List(s"-Duser.dir=${workingDir.getAbsolutePath}")
-        lazy val runtimeClasspath =  (Runtime / Keys.fullClasspath).value.map(_.data.toPath()).toList
+        lazy val runtimeClasspath =  BloopKeys.bloopProductDirectories.value.head.toPath() +:
+          (emulateRuntimeDependencyClasspath).value.map(_.toPath.toAbsolutePath).toList
         lazy val javaRuntimeHome = (Runtime / Keys.javaHome).value.map(_.toPath())
         lazy val javaRuntimeOptions = (Runtime / Keys.javaOptions).value
         val config = Config.JvmConfig(Some(javaHome.toPath), (extraJavaOptions ++ javaOptions).toList)
@@ -1209,6 +1210,12 @@ object BloopDefaults {
     internalClasspath ++ externalClasspath
   }
 
+  def emulateRuntimeDependencyClasspath: Def.Initialize[Task[Seq[File]]] = Def.task {
+    val internalClasspath = (Runtime / BloopKeys.bloopInternalClasspath).value.map(_._2)
+    val externalClasspath = (Runtime / Keys.externalDependencyClasspath).value.map(_.data)
+    internalClasspath ++ externalClasspath
+  }
+
   /**
    * This task is triggered by `bloopGenerate` and does stuff which is
    * sometimes dangerous because it can incur on cyclic dependencies, such as:

integrations/sbt-bloop/src/sbt-test/sbt-bloop/non-compiling/build.sbt

@@ -0,0 +1,26 @@
+import bloop.integrations.sbt.BloopDefaults
+
+name := "non-compiling"
+
+val bloopConfigFile = settingKey[File]("Config file to test")
+ThisBuild / bloopConfigFile := {
+  val bloopDir = Keys.baseDirectory.value./(".bloop")
+  val config = bloopDir./("non-compiling.json")
+  config
+}
+
+val bloopTestConfigFile = settingKey[File]("Test config file to test")
+ThisBuild / bloopTestConfigFile := {
+  val bloopDir = Keys.baseDirectory.value./(".bloop")
+  val config = bloopDir./("non-compiling-test.json")
+  config
+}
+
+val checkBloopFiles = taskKey[Unit]("Check bloop file contents")
+ThisBuild / checkBloopFiles := {
+  val configContents = BloopDefaults.unsafeParseConfig(bloopConfigFile.value.toPath)
+  assert(configContents.project.platform.isDefined)
+
+  val configTestContents = BloopDefaults.unsafeParseConfig(bloopTestConfigFile.value.toPath)
+  assert(configTestContents.project.platform.isDefined)
+}

integrations/sbt-bloop/src/sbt-test/sbt-bloop/non-compiling/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % sys.props.apply("plugin.version"))

integrations/sbt-bloop/src/sbt-test/sbt-bloop/non-compiling/src/main/scala/Obj.scala

@@ -0,0 +1,3 @@
+object Obj {
+  val a: Int = ""
+}

integrations/sbt-bloop/src/sbt-test/sbt-bloop/non-compiling/test

@@ -0,0 +1,3 @@
+> bloopGenerate
+> test:bloopGenerate
+> checkBloopFiles