From b57e8cd17af5dbc579f61cc401f93833f45d29f4 Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Thu, 11 Aug 2011 01:05:30 +0530 Subject: [PATCH] Hava scaladocOptions in GlobalScope for consistency --- main/Defaults.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index c638f6186..d499f4e4c 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -186,7 +186,8 @@ object Defaults extends BuildCommon mainClass <<= discoveredMainClasses map selectPackageMain, run <<= runTask(fullClasspath, mainClass in run, runner in run), runMain <<= runMainTask(fullClasspath, runner in run), - scaladocOptions <<= scalacOptions.identity, + scaladocOptions in GlobalScope :== Nil, + scaladocOptions <<= scaladocOptions or scalacOptions.identity, doc <<= docTask, copyResources <<= copyResourcesTask )