Skip to content
This repository
Browse code

remove most occurrences of ScalaObject

  • Loading branch information...
commit d8f5c39465ce5e276cc5683465cdee16c934fc87 1 parent 3f12f2e
Mark Harrah authored
2  compile/Eval.scala
@@ -21,7 +21,7 @@ final class EvalException(msg: String) extends RuntimeException(msg)
21 21 // not thread safe, since it reuses a Global instance
22 22 final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Settings => Reporter, backing: Option[File])
23 23 {
24   - def this(mkReporter: Settings => Reporter, backing: Option[File]) = this(Nil, IO.classLocationFile[ScalaObject] :: Nil, mkReporter, backing)
  24 + def this(mkReporter: Settings => Reporter, backing: Option[File]) = this(Nil, IO.classLocationFile[Product] :: Nil, mkReporter, backing)
25 25 def this() = this(s => new ConsoleReporter(s), None)
26 26
27 27 backing.foreach(IO.createDirectory)
2  launch/src/test/scala/ScalaProviderTest.scala
@@ -57,7 +57,7 @@ object ScalaProviderTest extends Specification
57 57 tryScala(loader)
58 58 getScalaVersion(loader) must beEqualTo(versionValue)
59 59 }
60   - private def tryScala(loader: ClassLoader): Unit = Class.forName("scala.ScalaObject", false, loader).getClassLoader must be(loader)
  60 + private def tryScala(loader: ClassLoader): Unit = Class.forName("scala.Product", false, loader).getClassLoader must be(loader)
61 61 }
62 62 object LaunchTest
63 63 {
4 sbt/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
@@ -12,7 +12,7 @@ class Foo {
12 12 val g = new GenericRunnerSettings(System.err.println)
13 13 val settings = new Settings()
14 14 settings.classpath.value = location(classOf[Holder])
15   - settings.bootclasspath.value = settings.bootclasspath.value + / + location(classOf[ScalaObject]) + / + location(classOf[Settings])
  15 + settings.bootclasspath.value = settings.bootclasspath.value + / + location(classOf[Product]) + / + location(classOf[Settings])
16 16 val inter = new Interpreter(settings) {
17 17 override protected def parentClassLoader = Foo.this.getClass.getClassLoader
18 18 }
@@ -35,4 +35,4 @@ object Test
35 35 val foo = new Foo
36 36 args.foreach { arg => foo.eval(arg) == arg.toInt }
37 37 }
38   -}
  38 +}
2  sbt/src/sbt-test/java/scala-library/src/main/java/test/R.java
@@ -2,5 +2,5 @@
2 2
3 3 public final class R {
4 4 public static final int y = 4;
5   - public static int x(scala.ScalaObject s) { return 3; }
  5 + public static int x(scala.Product s) { return 3; }
6 6 }
4 util/io/src/test/scala/FileUtilitiesSpecification.scala
@@ -23,7 +23,7 @@ object WriteContentSpecification extends Properties("Write content")
23 23
24 24 private def largeUnzip() =
25 25 {
26   - testUnzip[ScalaObject]
  26 + testUnzip[Product]
27 27 testUnzip[scala.tools.nsc.Global]
28 28 true
29 29 }
@@ -75,4 +75,4 @@ object WriteContentSpecification extends Properties("Write content")
75 75
76 76 private def withTemporaryFile[T](f: File => T): T =
77 77 withTemporaryDirectory { dir => f(new java.io.File(dir, "out")) }
78   -}
  78 +}
4 util/process/src/test/scala/ProcessSpecification.scala
@@ -82,10 +82,10 @@ private[this] object ProcessSpecification extends Properties("Process I/O")
82 82 {
83 83 val ignore = echo // just for the compile dependency so that this test is rerun when TestedProcess.scala changes, not used otherwise
84 84
85   - val thisClasspath = List(getSource[ScalaObject], getSource[IO.type], getSource[SourceTag]).mkString(File.pathSeparator)
  85 + val thisClasspath = List(getSource[Product], getSource[IO.type], getSource[SourceTag]).mkString(File.pathSeparator)
86 86 "java -cp " + thisClasspath + " " + command
87 87 }
88 88 private def getSource[T : Manifest]: String =
89 89 IO.classLocationFile[T].getAbsolutePath
90 90 }
91   -private trait SourceTag
  91 +private trait SourceTag

0 comments on commit d8f5c39

Please sign in to comment.
Something went wrong with that request. Please try again.