luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove most occurrences of ScalaObject

This commit is contained in:
Mark Harrah 2012-07-01 15:16:41 -04:00
parent 3f12f2eb9f
commit d8f5c39465
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile/Eval.scala
View File

@ -21,7 +21,7 @@ final class EvalException(msg: String) extends RuntimeException(msg)
// not thread safe, since it reuses a Global instance
final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Settings => Reporter, backing: Option[File])
{
def this(mkReporter: Settings => Reporter, backing: Option[File]) = this(Nil, IO.classLocationFile[ScalaObject] :: Nil, mkReporter, backing)
def this(mkReporter: Settings => Reporter, backing: Option[File]) = this(Nil, IO.classLocationFile[Product] :: Nil, mkReporter, backing)
def this() = this(s => new ConsoleReporter(s), None)
backing.foreach(IO.createDirectory)

2
launch/src/test/scala/ScalaProviderTest.scala
View File

@ -57,7 +57,7 @@ object ScalaProviderTest extends Specification
tryScala(loader)
getScalaVersion(loader) must beEqualTo(versionValue)
}
private def tryScala(loader: ClassLoader): Unit = Class.forName("scala.ScalaObject", false, loader).getClassLoader must be(loader)
private def tryScala(loader: ClassLoader): Unit = Class.forName("scala.Product", false, loader).getClassLoader must be(loader)
}
object LaunchTest
{

4
sbt/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
View File

@ -12,7 +12,7 @@ class Foo {
val g = new GenericRunnerSettings(System.err.println)
val settings = new Settings()
settings.classpath.value = location(classOf[Holder])
settings.bootclasspath.value = settings.bootclasspath.value + / + location(classOf[ScalaObject]) + / + location(classOf[Settings])
settings.bootclasspath.value = settings.bootclasspath.value + / + location(classOf[Product]) + / + location(classOf[Settings])
val inter = new Interpreter(settings) {
override protected def parentClassLoader = Foo.this.getClass.getClassLoader
}
@ -35,4 +35,4 @@ object Test
val foo = new Foo
args.foreach { arg => foo.eval(arg) == arg.toInt }
}
}
}

2
sbt/src/sbt-test/java/scala-library/src/main/java/test/R.java
View File

@ -2,5 +2,5 @@ package test;
public final class R {
public static final int y = 4;
public static int x(scala.ScalaObject s) { return 3; }
public static int x(scala.Product s) { return 3; }
}

4
util/io/src/test/scala/FileUtilitiesSpecification.scala
View File

@ -23,7 +23,7 @@ object WriteContentSpecification extends Properties("Write content")
private def largeUnzip() =
{
testUnzip[ScalaObject]
testUnzip[Product]
testUnzip[scala.tools.nsc.Global]
true
}
@ -75,4 +75,4 @@ object WriteContentSpecification extends Properties("Write content")
private def withTemporaryFile[T](f: File => T): T =
withTemporaryDirectory { dir => f(new java.io.File(dir, "out")) }
}
}

4
util/process/src/test/scala/ProcessSpecification.scala
View File

@ -82,10 +82,10 @@ private[this] object ProcessSpecification extends Properties("Process I/O")
{
val ignore = echo // just for the compile dependency so that this test is rerun when TestedProcess.scala changes, not used otherwise
val thisClasspath = List(getSource[ScalaObject], getSource[IO.type], getSource[SourceTag]).mkString(File.pathSeparator)
val thisClasspath = List(getSource[Product], getSource[IO.type], getSource[SourceTag]).mkString(File.pathSeparator)
"java -cp " + thisClasspath + " " + command
}
private def getSource[T : Manifest]: String =
IO.classLocationFile[T].getAbsolutePath
}
private trait SourceTag
private trait SourceTag