luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6146 from eatkins/metabuild 

Prepend scala instance jars to sbt classpath
This commit is contained in:
eugene yokota 2020-11-20 23:17:42 -05:00 committed by GitHub
parent 8a93dc96f7 5448a16ba4
commit a84d3329aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -1362,7 +1362,9 @@ def scriptedTask(launch: Boolean): Def.Initialize[InputTask[Unit]] = Def.inputTa
scriptedLaunchOpts.value ++ (if (launch) Some(launchJar) else None), scriptedLaunchOpts.value ++ (if (launch) Some(launchJar) else None),
scalaVersion.value, scalaVersion.value,
version.value, version.value,
(scriptedSbtReduxProj / Test / fullClasspathAsJars).value.map(_.data), (scriptedSbtReduxProj / Test / fullClasspathAsJars).value
.map(_.data)
.filterNot(_.getName.contains("scala-compiler")),
streams.value.log streams.value.log
) )
} }

7
main/src/main/scala/sbt/Defaults.scala
View File

@ -2506,14 +2506,15 @@ object Classpaths {
val isMeta = isMetaBuild.value val isMeta = isMetaBuild.value
val force = reresolveSbtArtifacts.value val force = reresolveSbtArtifacts.value
val app = appConfiguration.value val app = appConfiguration.value
val sbtCp0 = app.provider.mainClasspath.toList def isJansiOrJLine(f: File) = f.getName.contains("jline") || f.getName.contains("jansi")
val sbtCp = sbtCp0 map { Attributed.blank(_) } val scalaInstanceJars = app.provider.scalaProvider.jars.filterNot(isJansiOrJLine)
val sbtCp = (scalaInstanceJars ++ app.provider.mainClasspath).map(Attributed.blank)
val mjars = managedJars( val mjars = managedJars(
classpathConfiguration.value, classpathConfiguration.value,
classpathTypes.value, classpathTypes.value,
update.value update.value
) )
if (isMeta && !force) mjars ++ sbtCp if (isMeta && !force) (mjars ++ sbtCp).distinct
else mjars else mjars
}, },
exportedProducts := ClasspathImpl.trackedExportedProducts(TrackLevel.TrackAlways).value, exportedProducts := ClasspathImpl.trackedExportedProducts(TrackLevel.TrackAlways).value,

3
sbt/src/sbt-test/project/plugin-scala-compiler-dependency/project/Plugin.scala Normal file
View File

@ -0,0 +1,3 @@
import scala.tools.nsc
object Plugin

2
sbt/src/sbt-test/project/plugin-scala-compiler-dependency/test Normal file
View File

@ -0,0 +1,2 @@
> show sbtVersion
# we just want to test that the project loads