diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt index 6c0d86ed7..cedd2fa55 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt @@ -1,6 +1,6 @@ // for SbtExclusionRule with sbt 1.0 -import sbt.internal.librarymanagement._ +import Compatibility._ scalaVersion := "2.11.8" diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/src/main/scala-2.10/Compatibility.scala b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/src/main/scala-2.10/Compatibility.scala new file mode 100644 index 000000000..19835e1be --- /dev/null +++ b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/src/main/scala-2.10/Compatibility.scala @@ -0,0 +1 @@ +object Compatibility diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/src/main/scala-2.12/Compatibility.scala b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/src/main/scala-2.12/Compatibility.scala new file mode 100644 index 000000000..53962be7a --- /dev/null +++ b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/src/main/scala-2.12/Compatibility.scala @@ -0,0 +1,5 @@ +object Compatibility { + + val SbtExclusionRule = sbt.ExclusionRule + +} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/build.sbt index 372da643b..274b6a675 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/build.sbt @@ -3,6 +3,8 @@ lazy val noPomCheck = TaskKey[Unit]("noPomCheck") noPomCheck := { + val log = streams.value.log + val configReport = update.value .configuration("compile") .getOrElse { @@ -22,7 +24,7 @@ noPomCheck := { } for (a <- pomArtifacts) - streams.value.log.error(s"Found POM artifact $a") + log.error(s"Found POM artifact $a") assert(pomArtifacts.isEmpty) } diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/build.sbt index 0bae35eb6..83b642554 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/build.sbt @@ -20,6 +20,8 @@ lazy val shared = Seq( scalaVersion := "2.11.8", confCheck := { + val log = streams.value.log + val updateReport = update.value val updateClassifiersReport = updateClassifiers.value @@ -41,12 +43,12 @@ lazy val shared = Seq( a } - streams.value.log.info( + log.info( s"Found ${artifacts.length} artifacts for config $config / classifier $classifier" + (if (useClassifiersReport) " in classifiers report" else "") ) for (a <- artifacts) - streams.value.log.info(" " + a) + log.info(" " + a) artifacts } diff --git a/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/build.sbt b/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/build.sbt index 2a1f71f12..ebf7f80c8 100644 --- a/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/build.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/build.sbt @@ -1,6 +1,6 @@ // for SbtExclusionRule with sbt 1.0 -import sbt.internal.librarymanagement._ +import Compatibility._ enablePlugins(coursier.ShadingPlugin) shadingNamespace := "test.shaded" diff --git a/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/src/main/scala-2.10/Compatibility.scala b/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/src/main/scala-2.10/Compatibility.scala new file mode 100644 index 000000000..19835e1be --- /dev/null +++ b/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/src/main/scala-2.10/Compatibility.scala @@ -0,0 +1 @@ +object Compatibility diff --git a/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/src/main/scala-2.12/Compatibility.scala b/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/src/main/scala-2.12/Compatibility.scala new file mode 100644 index 000000000..53962be7a --- /dev/null +++ b/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/src/main/scala-2.12/Compatibility.scala @@ -0,0 +1,5 @@ +object Compatibility { + + val SbtExclusionRule = sbt.ExclusionRule + +} diff --git a/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt index a68e32723..167d55b76 100644 --- a/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/build.sbt @@ -19,9 +19,9 @@ lazy val checkToShadeClasses = TaskKey[Unit]("check-to-shade-classes") checkToShadeClasses := { val toShadeClasses0 = toShadeClasses.in(Shading).value + val log = streams.value.log if (toShadeClasses0.nonEmpty) { - val log = streams.value.log log.error(s"Found ${toShadeClasses0.length} classes to be explicitly shaded") for (name <- toShadeClasses0) log.error(" " + name)