diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/build/bnd/scala-continuations-library.bnd | 7 | ||||
-rw-r--r-- | src/build/bnd/scala-continuations-plugin.bnd | 7 | ||||
-rw-r--r-- | src/build/maven/scala-dist-pom.xml | 6 | ||||
-rw-r--r-- | src/build/maven/scala-library-all-pom.xml | 10 | ||||
-rw-r--r-- | src/library/rootdoc.txt | 2 | ||||
-rw-r--r-- | src/reflect/scala/reflect/internal/pickling/UnPickler.scala | 1 |
6 files changed, 0 insertions, 33 deletions
diff --git a/src/build/bnd/scala-continuations-library.bnd b/src/build/bnd/scala-continuations-library.bnd deleted file mode 100644 index b36718cc5b..0000000000 --- a/src/build/bnd/scala-continuations-library.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Delimited Continuations Library -Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-library -ver: @CONTINUATIONS_LIBRARY_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-continuations-plugin.bnd b/src/build/bnd/scala-continuations-plugin.bnd deleted file mode 100644 index 2f2464b452..0000000000 --- a/src/build/bnd/scala-continuations-plugin.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Delimited Continuations Compiler Plugin -Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-plugin -ver: @CONTINUATIONS_PLUGIN_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml index 9477e14285..1f6b6710ac 100644 --- a/src/build/maven/scala-dist-pom.xml +++ b/src/build/maven/scala-dist-pom.xml @@ -44,12 +44,6 @@ <artifactId>scalap</artifactId> <version>@VERSION@</version> </dependency> - <dependency> - <groupId>org.scala-lang.plugins</groupId> - <!-- plugins are fully cross-versioned. But, we don't publish with 2.11.0-SNAPSHOT, instead use full version of the last non-snapshot version --> - <artifactId>scala-continuations-plugin_@SCALA_FULL_VERSION@</artifactId> - <version>@CONTINUATIONS_PLUGIN_VERSION@</version> - </dependency> <!-- duplicated from scala-compiler, where it's optional, so that resolving scala-dist's transitive dependencies does not include jline, even though we need to include it in the dist, but macros depending on the compiler diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml index 3fcf207559..8b857ccc2a 100644 --- a/src/build/maven/scala-library-all-pom.xml +++ b/src/build/maven/scala-library-all-pom.xml @@ -49,16 +49,6 @@ <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId> <version>@PARSER_COMBINATORS_VERSION@</version> </dependency> - <!-- - the continuations plugin is a dependency of scala-dist, as scala-library-all should be - a drop-in replacement for scala-library, and as such should not (indirectly) - depend on plugins/the compiler. - --> - <dependency> - <groupId>org.scala-lang.plugins</groupId> - <artifactId>scala-continuations-library_@SCALA_BINARY_VERSION@</artifactId> - <version>@CONTINUATIONS_LIBRARY_VERSION@</version> - </dependency> <dependency> <groupId>org.scala-lang.modules</groupId> <artifactId>scala-swing_@SCALA_BINARY_VERSION@</artifactId> diff --git a/src/library/rootdoc.txt b/src/library/rootdoc.txt index e84942b8c4..0e9a175fcc 100644 --- a/src/library/rootdoc.txt +++ b/src/library/rootdoc.txt @@ -44,8 +44,6 @@ Additional parts of the standard library are shipped as separate libraries. Thes - [[scala.reflect `scala.reflect`]] - Scala's reflection API (scala-reflect.jar) - [[scala.xml `scala.xml`]] - XML parsing, manipulation, and serialization (scala-xml.jar) - [[scala.swing `scala.swing`]] - A convenient wrapper around Java's GUI framework called Swing (scala-swing.jar) - - [[scala.util.continuations `scala.util.continuations`]] - Delimited continuations using continuation-passing-style - (scala-continuations-library.jar, scala-continuations-plugin.jar) - [[scala.util.parsing `scala.util.parsing`]] - [[scala.util.parsing.combinator Parser combinators]], including an example implementation of a [[scala.util.parsing.json JSON parser]] (scala-parser-combinators.jar) - [[scala.actors `scala.actors`]] - Actor-based concurrency (deprecated and replaced by Akka actors, diff --git a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala index 1fc7aebab0..464bbad2cd 100644 --- a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala +++ b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala @@ -239,7 +239,6 @@ abstract class UnPickler { if (missing.startsWith("scala.xml")) Some(("org.scala-lang.modules", "scala-xml")) else if (missing.startsWith("scala.util.parsing")) Some(("org.scala-lang.modules", "scala-parser-combinators")) else if (missing.startsWith("scala.swing")) Some(("org.scala-lang.modules", "scala-swing")) - else if (missing.startsWith("scala.util.continuations")) Some(("org.scala-lang.plugins", "scala-continuations-library")) else None (module map { case (group, art) => |