From d9740f82a3aea3b223233776cd7c9460a2e4dfc3 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Tue, 24 Apr 2012 06:08:12 -0700 Subject: 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." --- src/library/scala/ScalaObject.scala | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/library/scala/ScalaObject.scala (limited to 'src') 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 -- cgit v1.2.3