diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-03-28 20:31:49 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-03-28 20:31:49 +0100 |
| commit | fabca426ebfe45295163f3f99d50e9b652ca01f6 (patch) | |
| tree | e4003e9a7f43409465ab06d5816590bb481bdd02 | |
| parent | bd9cde4c850e8566380cc0030ee7ab21b1b2842f (diff) | |
| parent | 12720e699dce034bf54dedb556bf7611e6e1f474 (diff) | |
| download | scala-fabca426ebfe45295163f3f99d50e9b652ca01f6.tar.gz scala-fabca426ebfe45295163f3f99d50e9b652ca01f6.tar.bz2 scala-fabca426ebfe45295163f3f99d50e9b652ca01f6.zip | |
Merge pull request #3661 from adriaanm/plugin-not-in-scala-library
Remove scala-continuations-plugin from scala-library-all
| -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> |