From 7dadbf1fc6915e61cb6ddc4aa304fc8ae9e78ae6 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 23 Jul 2013 15:20:45 -0400 Subject: [PATCH] Drop unneeded import that triggers SI-7690. --- main/src/main/scala/sbt/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index e2f33aec5..08823ddd8 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1414,6 +1414,7 @@ object Classpaths if(autoCompilerPlugins.value) options ++ newPlugins.filterNot(existing) else options } ) + @deprecated("Doesn't properly handle non-standard Scala organizations.", "0.13.0") def substituteScalaFiles(scalaInstance: ScalaInstance, report: UpdateReport): UpdateReport = substituteScalaFiles(scalaInstance, ScalaArtifacts.Organization, report) @@ -1424,7 +1425,6 @@ object Classpaths def substituteScalaFiles(scalaOrg: String, report: UpdateReport)(scalaJars: String => Seq[File]): UpdateReport = report.substitute { (configuration, module, arts) => - import ScalaArtifacts._ if(module.organization == scalaOrg) { val jarName = module.name + ".jar" val replaceWith = scalaJars(module.revision).filter(_.getName == jarName).map(f => (Artifact(f.getName.stripSuffix(".jar")), f))