From fb46cc5f66f3f71e387a430efe2da50e11257d3b Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 24 Sep 2018 16:06:36 +0200 Subject: [PATCH] Tweak scripted test for sbt 1.x --- .../scala-jars/src/main/scala/Main.scala | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala index 6d3e69d54..43f0726f1 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala +++ b/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala @@ -1,6 +1,8 @@ import java.io.File import java.nio.file.Files +import scala.collection.JavaConverters._ + object Main extends App { val cp = new collection.mutable.ArrayBuffer[File] @@ -35,7 +37,18 @@ object Main extends App { assert(jar.getAbsolutePath.startsWith(prefix), s"JAR for $name ($jar) not under $prefix") } - fromBootAndUnique("scala-library") + val props = Thread.currentThread() + .getContextClassLoader + .getResources("library.properties") + .asScala + .toVector + .map(_.toString) + .sorted + + // That one doesn't pass with sbt 1.x, maybe because of classloader filtering? + // fromBootAndUnique("scala-library") + assert(props.lengthCompare(1) == 0, s"Found several library.properties files in classpath: $props") + fromBootAndUnique("scala-reflect") fromBootAndUnique("scala-compiler")