From f5c282b85f2e290cc884dbd095405501826ba9e0 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Wed, 11 May 2016 18:24:59 +1000 Subject: [PATCH] Remove type alias for Classpath The class has becom monomorphic in 2.12.x which breaks this alias definition. It was unused within partest itself, and the usage in scala/scala has been removed. --- build.sbt | 2 +- src/main/scala/scala/tools/partest/package.scala | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 8e586e1..799cb3d 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ crossScalaVersions := { if (java.startsWith("1.6.")) Seq("2.11.7", "2.12.0-M1") else if (java.startsWith("1.8.")) - Seq("2.12.0-M3") + Seq("2.12.0-M4") else sys.error(s"don't know what Scala versions to build on $java") } diff --git a/src/main/scala/scala/tools/partest/package.scala b/src/main/scala/scala/tools/partest/package.scala index fbb6636..5b410b8 100644 --- a/src/main/scala/scala/tools/partest/package.scala +++ b/src/main/scala/scala/tools/partest/package.scala @@ -16,7 +16,6 @@ package object partest { type Directory = scala.reflect.io.Directory type Path = scala.reflect.io.Path type PathResolver = scala.tools.util.PathResolver - type ClassPath[T] = scala.tools.nsc.util.ClassPath[T] type StringWriter = java.io.StringWriter val SFile = scala.reflect.io.File