From 792fd68be06e79e88936b57a4c3c5c78c8dc4c3c Mon Sep 17 00:00:00 2001 From: Aaron Niskode-Dossett Date: Tue, 6 Mar 2018 17:48:27 +0000 Subject: [PATCH] scrooge-sbt-plugin: Clarify default for scroogeThriftOutputFolder Summary: Problem The explanation for the default value of scroogeThriftOutputFolder is out of date. The default output is now sourceManaged/thrift. The output of git diff scrooge-4.7.0 -- src/main/scala/com/twitter/ScroogeSBT.scala shows, in part, this: ``` - scroogeThriftOutputFolder <<= (sourceManaged) { identity }, + scroogeThriftOutputFolder in Compile := (sourceManaged in Compile).value / "thrift", + scroogeThriftOutputFolder in Test := (sourceManaged in Test).value / "thrift", ``` Signed-off-by: Moses Nakamura Differential Revision: https://phabricator.twitter.biz/D144011 --- doc/src/sphinx/SBTPlugin.rst | 2 +- scrooge-sbt-plugin/src/main/scala/com/twitter/ScroogeSBT.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/sphinx/SBTPlugin.rst b/doc/src/sphinx/SBTPlugin.rst index 91e3b0314..eaa34d7e1 100644 --- a/doc/src/sphinx/SBTPlugin.rst +++ b/doc/src/sphinx/SBTPlugin.rst @@ -63,7 +63,7 @@ most likely to want to edit: - **scroogeThriftOutputFolder: File** where to put the generated scala files - (default: `target//src_managed`) + (default: `target//src_managed/thrift`) Migrating from 3.x.x to 3.18.0 diff --git a/scrooge-sbt-plugin/src/main/scala/com/twitter/ScroogeSBT.scala b/scrooge-sbt-plugin/src/main/scala/com/twitter/ScroogeSBT.scala index 828767609..1d9c24268 100644 --- a/scrooge-sbt-plugin/src/main/scala/com/twitter/ScroogeSBT.scala +++ b/scrooge-sbt-plugin/src/main/scala/com/twitter/ScroogeSBT.scala @@ -123,7 +123,7 @@ object ScroogeSBT extends AutoPlugin { val scroogeThriftOutputFolder = SettingKey[File]( "scrooge-thrift-output-folder", - "output folder for generated files (defaults to sourceManaged)" + "output folder for generated files (defaults to sourceManaged/thrift)" ) val scroogeIsDirty = TaskKey[Boolean](