summaryrefslogtreecommitdiff
path: root/src/build/dbuild-meta-json-gen.scala
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-07-25 16:31:11 +0200
committerGitHub <noreply@github.com>2016-07-25 16:31:11 +0200
commit1e7ce6e774f2428356887d71870557b67062ef7f (patch)
tree4c61de07d1ef09a52db614b02ee232c4e1db4f80 /src/build/dbuild-meta-json-gen.scala
parentb6812321be6686d17774db42a98c9aca869b51d5 (diff)
parentdc326cd8213ef15cb7647dddfc5144ae47b01b5e (diff)
downloadscala-1e7ce6e774f2428356887d71870557b67062ef7f.tar.gz
scala-1e7ce6e774f2428356887d71870557b67062ef7f.tar.bz2
scala-1e7ce6e774f2428356887d71870557b67062ef7f.zip
Merge pull request #4851 from soc/SI-9560-scaladoc-json-dep
SI-9560 Remove dependency on parser-combinators/json
Diffstat (limited to 'src/build/dbuild-meta-json-gen.scala')
-rw-r--r--src/build/dbuild-meta-json-gen.scala5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala
index 043ad19b2e..6405650d88 100644
--- a/src/build/dbuild-meta-json-gen.scala
+++ b/src/build/dbuild-meta-json-gen.scala
@@ -23,8 +23,7 @@ val meta =
Project("scala-compiler", "org.scala-lang",
Seq(ProjectRef("scala-compiler", "org.scala-lang")),
Seq(ProjectRef("scala-reflect", "org.scala-lang"),
- ProjectRef("scala-xml", "org.scala-lang.modules"),
- ProjectRef("scala-parser-combinators", "org.scala-lang.modules")
+ ProjectRef("scala-xml", "org.scala-lang.modules")
)),
// Project("scala-repl", "org.scala-lang",
@@ -37,7 +36,7 @@ val meta =
// Project("scaladoc", "org.scala-lang",
// Seq(ProjectRef("scaladoc", "org.scala-lang")),
- // Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))),
+ // Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"))),
Project("scalap", "org.scala-lang",
Seq(ProjectRef("scalap", "org.scala-lang")),