diff options
| author | Som Snytt <som.snytt@gmail.com> | 2016-03-25 23:53:00 -0700 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-04-22 09:56:30 +0200 |
| commit | 0c5b42d974fbd3703f29f0232e2c9215e41fb379 (patch) | |
| tree | 0d2b5a511344ac305064f7c29e21c7378e35ebe4 /src/compiler/scala/tools/nsc/util/ClassPath.scala | |
| parent | f55dd2084eca97c576a982473ab6701f98fb79a7 (diff) | |
| download | scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.tar.gz scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.tar.bz2 scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.zip | |
SI-9684 Deprecate JavaConversions
Implicit conversions are now in package convert as ImplicitConversions,
ImplicitConversionsToScala and ImplicitConversionsToJava.
Deprecated WrapAsJava, WrapAsScala and the values in package object.
Improve documentation.
Diffstat (limited to 'src/compiler/scala/tools/nsc/util/ClassPath.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/ClassPath.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index 6cdc3856cd..e5af1edadb 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -113,10 +113,9 @@ object ClassPath { } def manifests: List[java.net.URL] = { - import scala.collection.convert.WrapAsScala.enumerationAsScalaIterator - Thread.currentThread().getContextClassLoader() - .getResources("META-INF/MANIFEST.MF") - .filter(_.getProtocol == "jar").toList + import scala.collection.JavaConverters._ + val resources = Thread.currentThread().getContextClassLoader().getResources("META-INF/MANIFEST.MF") + resources.asScala.filter(_.getProtocol == "jar").toList } class JavaContext extends ClassPathContext[AbstractFile] { |