Moved cloneable class to package `scala.annotation`.

Requires a new starr.

10 files changed, 8 insertions, 157 deletions

diff --git a/lib/scala-compiler-src.jar.desired.sha1 b/lib/scala-compiler-src.jar.desired.sha1
new file mode 100644
index 0000000000..48b3d3284e
--- /dev/null
+++ b/lib/scala-compiler-src.jar.desired.sha1
@@ -0,0 +1 @@
+259fd9f0a50ed6003248a01a366a97a5549aa386 ?scala-compiler-src.jar
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index b4404c3d24..a8dbdb0a38 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-dacc6e38cdd2eabbf2e4780061c3b4c9e125274d *scala-compiler.jar
+42f7367cc6ac59022d098e6091e5425390b9c925 ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index 4711fc583e..3379287733 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-0772f79076f74e298e7bf77ad4dfa464c50efe61 *scala-library-src.jar
+e31e38414fd19c10add3e65bf77c2fd7c6c26f7d ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 3f92447c1a..bef528ce26 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-4edcb1b7030e74259cd906e9230d45a3fffc0444 *scala-library.jar
+2418c95bf7db34f87ebda4a5eaa918fe85047afb ?scala-library.jar
diff --git a/lib/scala-reflect-src.jar.desired.sha1 b/lib/scala-reflect-src.jar.desired.sha1
new file mode 100644
index 0000000000..b3a5f03efe
--- /dev/null
+++ b/lib/scala-reflect-src.jar.desired.sha1
@@ -0,0 +1 @@
+51c64d77ad4c4233a06cea7ea80b0fb77e9867c4 ?scala-reflect-src.jar
diff --git a/lib/scala-reflect.jar.desired.sha1 b/lib/scala-reflect.jar.desired.sha1
index 1f8440cd4a..4d913d73ab 100644
--- a/lib/scala-reflect.jar.desired.sha1
+++ b/lib/scala-reflect.jar.desired.sha1
@@ -1 +1 @@
-1187b9c68ca80f951826b1a9b374e8646d9c9a71 *scala-reflect.jar
+5656bf2f17bb9f22b3ba61a83393a9794eaa5429 ?scala-reflect.jar
diff --git a/src/library/scala/cloneable.scala b/src/library/scala/cloneable.scala
deleted file mode 100644
index 32a1ea640d..0000000000
--- a/src/library/scala/cloneable.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2011, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-
-
-package scala
-
-/**
- * An annotation that designates the class to which it is applied as cloneable
- */
-class cloneable extends annotation.StaticAnnotation
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala
index 5f90c32e22..070ae26862 100644
--- a/src/library/scala/package.scala
+++ b/src/library/scala/package.scala
@@ -37,6 +37,8 @@ package object scala {
   @deprecated("instead of `@serializable class C`, use `class C extends Serializable`", "2.9.0")
   type serializable = annotation.serializable
 
+  type cloneable = annotation.cloneable
+
   type TraversableOnce[+A] = scala.collection.TraversableOnce[A]
 
   type Traversable[+A] = scala.collection.Traversable[A]
diff --git a/src/starr/library/scala/cloneable.scala b/src/starr/library/scala/cloneable.scala
deleted file mode 100644
index e69de29bb2..0000000000
--- a/src/starr/library/scala/cloneable.scala
+++ /dev/null
diff --git a/src/starr/library/scala/package.scala b/src/starr/library/scala/package.scala
deleted file mode 100644
index 070ae26862..0000000000
--- a/src/starr/library/scala/package.scala
+++ /dev/null
@@ -1,137 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2011, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-
-/**
- * Core Scala types. They are always available without an explicit import.
- * @contentDiagram hideNodes "scala.Serializable"
- */
-package object scala {
-  type Throwable = java.lang.Throwable
-  type Exception = java.lang.Exception
-  type Error     = java.lang.Error
-
-  type RuntimeException                = java.lang.RuntimeException
-  type NullPointerException            = java.lang.NullPointerException
-  type ClassCastException              = java.lang.ClassCastException
-  type IndexOutOfBoundsException       = java.lang.IndexOutOfBoundsException
-  type ArrayIndexOutOfBoundsException  = java.lang.ArrayIndexOutOfBoundsException
-  type StringIndexOutOfBoundsException = java.lang.StringIndexOutOfBoundsException
-  type UnsupportedOperationException   = java.lang.UnsupportedOperationException
-  type IllegalArgumentException        = java.lang.IllegalArgumentException
-  type NoSuchElementException          = java.util.NoSuchElementException
-  type NumberFormatException           = java.lang.NumberFormatException
-  type AbstractMethodError             = java.lang.AbstractMethodError
-  type InterruptedException            = java.lang.InterruptedException
-
-  // A dummy used by the specialization annotation.
-  val AnyRef = new Specializable {
-    override def toString = "object AnyRef"
-  }
-
-  @deprecated("instead of `@serializable class C`, use `class C extends Serializable`", "2.9.0")
-  type serializable = annotation.serializable
-
-  type cloneable = annotation.cloneable
-
-  type TraversableOnce[+A] = scala.collection.TraversableOnce[A]
-
-  type Traversable[+A] = scala.collection.Traversable[A]
-  val Traversable = scala.collection.Traversable
-
-  type Iterable[+A] = scala.collection.Iterable[A]
-  val Iterable = scala.collection.Iterable
-
-  type Seq[+A] = scala.collection.Seq[A]
-  val Seq = scala.collection.Seq
-
-  type IndexedSeq[+A] = scala.collection.IndexedSeq[A]
-  val IndexedSeq = scala.collection.IndexedSeq
-
-  type Iterator[+A] = scala.collection.Iterator[A]
-  val Iterator = scala.collection.Iterator
-
-  type BufferedIterator[+A] = scala.collection.BufferedIterator[A]
-
-  type List[+A] = scala.collection.immutable.List[A]
-  val List = scala.collection.immutable.List
-
-  val Nil = scala.collection.immutable.Nil
-
-  type ::[A] = scala.collection.immutable.::[A]
-  val :: = scala.collection.immutable.::
-
-  val +: = scala.collection.+:
-  val :+ = scala.collection.:+
-
-  type Stream[+A] = scala.collection.immutable.Stream[A]
-  val Stream = scala.collection.immutable.Stream
-  val #:: = scala.collection.immutable.Stream.#::
-
-  type Vector[+A] = scala.collection.immutable.Vector[A]
-  val Vector = scala.collection.immutable.Vector
-
-  type StringBuilder = scala.collection.mutable.StringBuilder
-  val StringBuilder = scala.collection.mutable.StringBuilder
-
-  type Range = scala.collection.immutable.Range
-  val Range = scala.collection.immutable.Range
-
-  // Numeric types which were moved into scala.math.*
-
-  type BigDecimal = scala.math.BigDecimal
-  val BigDecimal = scala.math.BigDecimal
-
-  type BigInt = scala.math.BigInt
-  val BigInt = scala.math.BigInt
-
-  type Equiv[T] = scala.math.Equiv[T]
-  val Equiv = scala.math.Equiv
-
-  type Fractional[T] = scala.math.Fractional[T]
-  type Integral[T] = scala.math.Integral[T]
-
-  type Numeric[T] = scala.math.Numeric[T]
-  val Numeric = scala.math.Numeric
-
-  type Ordered[T] = scala.math.Ordered[T]
-  val Ordered = scala.math.Ordered
-
-  type Ordering[T] = scala.math.Ordering[T]
-  val Ordering = scala.math.Ordering
-
-  type PartialOrdering[T] = scala.math.PartialOrdering[T]
-  type PartiallyOrdered[T] = scala.math.PartiallyOrdered[T]
-
-  type Either[+A, +B] = scala.util.Either[A, B]
-  val Either = scala.util.Either
-
-  type Left[+A, +B] = scala.util.Left[A, B]
-  val Left = scala.util.Left
-
-  type Right[+A, +B] = scala.util.Right[A, B]
-  val Right = scala.util.Right
-
-  // Annotations which we might move to annotation.*
-/*
-  type SerialVersionUID = annotation.SerialVersionUID
-  type cloneable = annotation.cloneable
-  type deprecated = annotation.deprecated
-  type deprecatedName = annotation.deprecatedName
-  type inline = annotation.inline
-  type native = annotation.native
-  type noinline = noannotation.inline
-  type remote = annotation.remote
-  type serializable = annotation.serializable
-  type specialized = annotation.specialized
-  type transient = annotation.transient
-  type throws  = annotation.throws
-  type unchecked = annotation.unchecked.unchecked
-  type volatile = annotation.volatile
-  */
-}