From 112052241cb1a8ac64a11d3a989f3aecdf73c560 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Aug 2014 19:12:27 -0400 Subject: [PATCH] #1550. Fixes scripted/join that broke with #1546 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Name hashing is now turned on by default, so I’m changing the value for inc.Relations.empty, so inc.Analysis.empty functions as expected when it’s joined with name hashing analyses. --- compile/inc/src/main/scala/sbt/inc/IncOptions.scala | 2 +- compile/inc/src/main/scala/sbt/inc/Relations.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compile/inc/src/main/scala/sbt/inc/IncOptions.scala b/compile/inc/src/main/scala/sbt/inc/IncOptions.scala index b2a147b98..b38fed952 100644 --- a/compile/inc/src/main/scala/sbt/inc/IncOptions.scala +++ b/compile/inc/src/main/scala/sbt/inc/IncOptions.scala @@ -217,7 +217,7 @@ final class IncOptions( object IncOptions extends Serializable { private val recompileOnMacroDefDefault: Boolean = true - private val nameHashingDefault: Boolean = true + private[sbt] val nameHashingDefault: Boolean = true private val antStyleDefault: Boolean = false val Default = IncOptions( // 1. recompile changed sources diff --git a/compile/inc/src/main/scala/sbt/inc/Relations.scala b/compile/inc/src/main/scala/sbt/inc/Relations.scala index a42794eb6..f244c431f 100644 --- a/compile/inc/src/main/scala/sbt/inc/Relations.scala +++ b/compile/inc/src/main/scala/sbt/inc/Relations.scala @@ -227,7 +227,7 @@ object Relations { def emptySource: Source = es private[inc] lazy val emptySourceDependencies: SourceDependencies = new SourceDependencies(e, estr) - def empty: Relations = empty(nameHashing = false) + def empty: Relations = empty(nameHashing = IncOptions.nameHashingDefault) private[inc] def empty(nameHashing: Boolean): Relations = if (nameHashing) new MRelationsNameHashing(e, e, emptySourceDependencies, emptySourceDependencies, estr, estr)