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

Merge pull request #4610 from eatkins/scala-check 

Scala check
This commit is contained in:
Ethan Atkins 2019-04-07 16:04:33 -07:00 committed by GitHub
parent b40084f6fd fc715cab44
commit cbfcedc9d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main/src/main/scala/sbt/internal/ClassLoaders.scala
View File

@ -21,6 +21,8 @@ import sbt.internal.util.Attributed.data
import sbt.io.IO
import sbt.librarymanagement.Configurations.{ Runtime, Test }
import scala.annotation.tailrec
private[sbt] object ClassLoaders {
private[this] val interfaceLoader = classOf[sbt.testing.Framework].getClassLoader
/*
@ -198,7 +200,10 @@ private[sbt] object ClassLoaders {
// helper methods
private def flatLoader(classpath: Seq[File], parent: ClassLoader): ClassLoader =
new URLClassLoader(classpath.map(_.toURI.toURL).toArray, parent)
new URLClassLoader(classpath.map(_.toURI.toURL).toArray, parent) {
override def toString: String =
s"FlatClassLoader(parent = $interfaceLoader, jars =\n${classpath.mkString("\n")}\n)"
}
}
@ -211,9 +216,15 @@ private[sbt] object SbtMetaBuildClassLoader {
}
}
def apply(libraryLoader: ClassLoader, fullLoader: ClassLoader): ClassLoader = {
@tailrec
def bootLoader(classLoader: ClassLoader): ClassLoader = classLoader.getParent match {
case null => classLoader
case c if c.getClass.getCanonicalName == "xsbt.boot.BootFilteredLoader" => c
case c => bootLoader(c)
}
val interfaceFilter: URL => Boolean = _.getFile.endsWith("test-interface-1.0.jar")
val (interfaceURL, rest) = fullLoader.urls.partition(interfaceFilter)
val interfaceLoader = new URLClassLoader(interfaceURL, libraryLoader.getParent) {
val interfaceLoader = new URLClassLoader(interfaceURL, bootLoader(libraryLoader)) {
override def toString: String = s"SbtTestInterfaceClassLoader(${getURLs.head})"
}
val updatedLibraryLoader = new URLClassLoader(libraryLoader.urls, interfaceLoader) {

8
sbt/src/sbt-test/tests/test-cross/build.sbt Normal file
View File

@ -0,0 +1,8 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
lazy val root = (project in file("."))
.settings(
// Verifies that a different scala library version still works in test
scalaVersion := "2.11.12",
libraryDependencies += scalatest % Test
)

8
sbt/src/sbt-test/tests/test-cross/src/test/scala/Test.scala Normal file
View File

@ -0,0 +1,8 @@
import java.io.File
import org.scalatest.FlatSpec
class Test extends FlatSpec {
"a test" should "pass" in {
assert(true)
}
}

1
sbt/src/sbt-test/tests/test-cross/test Normal file
View File

@ -0,0 +1 @@
> test

4
scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
View File

@ -255,7 +255,9 @@ final class ScriptedTests(
case "source-dependencies/linearization" => LauncherBased // sbt/Package$
case "source-dependencies/named" => LauncherBased // sbt/Package$
case "source-dependencies/specialized" => LauncherBased // sbt/Package$
case _ => RunFromSourceBased
case "tests/test-cross" =>
LauncherBased // the sbt metabuild classpath leaks into the test interface classloader in older versions of sbt
case _ => RunFromSourceBased
}
// sbt/Package$ means:
// java.lang.NoClassDefFoundError: sbt/Package$ (wrong name: sbt/package$)