diff options
| -rwxr-xr-x | build.xml | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Liftables.scala | 8 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Quasiquotes.scala | 2 | ||||
| -rw-r--r-- | versions.properties | 10 |
4 files changed, 14 insertions, 8 deletions
@@ -550,6 +550,7 @@ TODO: <echo message="Updating `versions.properties`:"/> <echo message="starr.version = ${starr.version}"/> <echo message="scala.binary.version = ${scala.binary.version}"/> + <echo message="scala.full.version = ${scala.full.version}"/> <echo message="scala-xml.version.number = ${scala-xml.version.number}"/> <echo message="scala-parser-combinators.version.number = ${scala-parser-combinators.version.number}"/> <echo message="scala-continuations-plugin.version.number = ${scala-continuations-plugin.version.number}"/> @@ -563,6 +564,7 @@ TODO: <propertyfile file="versions.properties"> <entry key="starr.version" value="${starr.version}"/> <entry key="scala.binary.version" value="${scala.binary.version}"/> + <entry key="scala.full.version" value="${scala.full.version}"/> <entry key="scala-xml.version.number" value="${scala-xml.version.number}"/> <entry key="scala-parser-combinators.version.number" value="${scala-parser-combinators.version.number}"/> <entry key="scala-continuations-plugin.version.number" value="${scala-continuations-plugin.version.number}"/> diff --git a/src/reflect/scala/reflect/api/Liftables.scala b/src/reflect/scala/reflect/api/Liftables.scala index ec9d85b69e..673dbce6f5 100644 --- a/src/reflect/scala/reflect/api/Liftables.scala +++ b/src/reflect/scala/reflect/api/Liftables.scala @@ -6,7 +6,7 @@ trait Liftables { self: Universe => /** A type class that defines a representation of `T` as a `Tree`. * - * @see [[http://docs.scala-lang.org/overviews/macros/quasiquotes.html#lifting]] + * @see [[http://docs.scala-lang.org/overviews/quasiquotes/lifting.html]] */ trait Liftable[T] { def apply(value: T): Tree @@ -32,7 +32,7 @@ trait Liftables { self: Universe => * lifted: universe.Tree = O * }}} * - * @see [[http://docs.scala-lang.org/overviews/macros/quasiquotes.html#lifting]] + * @see [[http://docs.scala-lang.org/overviews/quasiquotes/lifting.html]] */ def apply[T](f: T => Tree): Liftable[T] = new Liftable[T] { def apply(value: T): Tree = f(value) } @@ -40,7 +40,7 @@ trait Liftables { self: Universe => /** A type class that defines a way to extract instance of `T` from a `Tree`. * - * @see [[http://docs.scala-lang.org/overviews/macros/quasiquotes.html#unlifting]] + * @see [[http://docs.scala-lang.org/overviews/quasiquotes/unlifting.html]] */ trait Unliftable[T] { def unapply(tree: Tree): Option[T] @@ -66,7 +66,7 @@ trait Liftables { self: Universe => * scala> val q"${_: O.type}" = q"$Oref" * }}} * - * @see [[http://docs.scala-lang.org/overviews/macros/quasiquotes.html#unlifting]] + * @see [[http://docs.scala-lang.org/overviews/quasiquotes/unlifting.html]] */ def apply[T](pf: PartialFunction[Tree, T]): Unliftable[T] = new Unliftable[T] { def unapply(value: Tree): Option[T] = pf.lift(value) diff --git a/src/reflect/scala/reflect/api/Quasiquotes.scala b/src/reflect/scala/reflect/api/Quasiquotes.scala index 0065926e3b..e905aa4153 100644 --- a/src/reflect/scala/reflect/api/Quasiquotes.scala +++ b/src/reflect/scala/reflect/api/Quasiquotes.scala @@ -7,7 +7,7 @@ trait Quasiquotes { self: Universe => * that are also known as quasiquotes. With their help you can easily manipulate * Scala reflection ASTs. * - * @see [[http://docs.scala-lang.org/overviews/macros/quasiquotes.html]] + * @see [[http://docs.scala-lang.org/overviews/quasiquotes/intro.html]] */ implicit class Quasiquote(ctx: StringContext) { protected trait api { diff --git a/versions.properties b/versions.properties index 54d1a5536b..ad4eab5ad1 100644 --- a/versions.properties +++ b/versions.properties @@ -1,4 +1,9 @@ #Wed, 19 Mar 2014 03:05:28 +0100 +# NOTE: this file determines the content of the scala-distribution +# via scala-dist-pom.xml and scala-library-all-pom.xml +# when adding new properties that influence a release, +# also add them to the update.versions mechanism in build.xml, +# which is used by scala-release-2.11.x in scala/jenkins-scripts starr.version=2.11.0-RC3 starr.use.released=1 @@ -8,16 +13,15 @@ starr.use.released=1 # e.g. 2.11.0-RC1, 2.11 scala.binary.version=2.11.0-RC3 # e.g. 2.11.0-RC1, 2.11.0, 2.11.1-RC1, 2.11.1 +# this defines the dependency on scala-continuations-plugin in scala-dist's pom scala.full.version=2.11.0-RC3 -# external modules shipped with distribution: +# external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.1 scala-parser-combinators.version.number=1.0.1 scala-continuations-plugin.version.number=1.0.1 scala-continuations-library.version.number=1.0.1 scala-swing.version.number=1.0.1 - -# these ship with distribution (and scala-library-all depends on them) akka-actor.version.number=2.3.0 actors-migration.version.number=1.1.0 |