diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-28 10:13:58 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-28 10:41:04 -0700 |
| commit | 12720e699dce034bf54dedb556bf7611e6e1f474 (patch) | |
| tree | a5b4e4d69e3d67c7d8b37179a684d683d304bead /src/build | |
| parent | 306c9cb37acf3b72c854830abecd137c638ef67d (diff) | |
| download | scala-12720e699dce034bf54dedb556bf7611e6e1f474.tar.gz scala-12720e699dce034bf54dedb556bf7611e6e1f474.tar.bz2 scala-12720e699dce034bf54dedb556bf7611e6e1f474.zip | |
Remove scala-continuations-plugin from scala-library-all
The continuations plugin should instead be 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.
Diffstat (limited to 'src/build')
| -rw-r--r-- | src/build/maven/scala-dist-pom.xml | 5 | ||||
| -rw-r--r-- | src/build/maven/scala-library-all-pom.xml | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml index 9a566d231b..83ebc263c0 100644 --- a/src/build/maven/scala-dist-pom.xml +++ b/src/build/maven/scala-dist-pom.xml @@ -39,6 +39,11 @@ <artifactId>scala-compiler</artifactId> <version>@VERSION@</version> </dependency> + <dependency> + <groupId>org.scala-lang.plugins</groupId> + <artifactId>scala-continuations-plugin_@VERSION@</artifactId> <!-- plugins are fully cross-versioned --> + <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 b649c8c525..3fcf207559 100644 --- a/src/build/maven/scala-library-all-pom.xml +++ b/src/build/maven/scala-library-all-pom.xml @@ -49,11 +49,11 @@ <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId> <version>@PARSER_COMBINATORS_VERSION@</version> </dependency> - <dependency> - <groupId>org.scala-lang.plugins</groupId> - <artifactId>scala-continuations-plugin_@SCALA_BINARY_VERSION@</artifactId> - <version>@CONTINUATIONS_PLUGIN_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> |