summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-04-24 06:08:12 -0700
committerPaul Phillips <paulp@improving.org>2012-04-24 06:08:12 -0700
commitd9740f82a3aea3b223233776cd7c9460a2e4dfc3 (patch)
tree294848f5bf8617e6d555e7389eabbb64fc5011ce
parent40e9fe51a5dbfbd17baac3474afc803d689a1adc (diff)
downloadscala-d9740f82a3aea3b223233776cd7c9460a2e4dfc3.tar.gz
scala-d9740f82a3aea3b223233776cd7c9460a2e4dfc3.tar.bz2
scala-d9740f82a3aea3b223233776cd7c9460a2e4dfc3.zip
Back from the dead, it's ScalaObject!
Trying to compile sbt with 2.10.0 reminded me that ScalaObject wasn't only a marker interface, it was a public trait in the library and has to be removed properly. "The ol' boy had a bit of life in him yet, 'e did."
-rw-r--r--src/library/scala/ScalaObject.scala16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/library/scala/ScalaObject.scala b/src/library/scala/ScalaObject.scala
new file mode 100644
index 0000000000..7cd64becbe
--- /dev/null
+++ b/src/library/scala/ScalaObject.scala
@@ -0,0 +1,16 @@
+/* __ *\
+** ________ ___ / / ___ Scala API **
+** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL **
+** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
+** /____/\___/_/ |_/____/_/ | | **
+** |/ **
+\* */
+
+package scala
+
+/** Until scala 2.10.0 this marker trait was added to
+ * scala-compiled classes. Now it only exists for backward
+ * compatibility.
+ */
+@deprecated("ScalaObject will be removed", "2.10.0")
+trait ScalaObject