From 0fa5b8573602656f8ae0ddee6537cc0fe8ba89ae Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 15 Jun 2011 19:08:49 -0400 Subject: [PATCH] fix ProjectDefinition.equals not considering base directory, ref #54 --- main/Project.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/Project.scala b/main/Project.scala index d4e198d0d..af120e049 100644 --- a/main/Project.scala +++ b/main/Project.scala @@ -24,9 +24,9 @@ sealed trait ProjectDefinition[PR <: ProjectReference] def uses: Seq[PR] = aggregate ++ dependencies.map(_.project) def referenced: Seq[PR] = delegates ++ uses - override final def hashCode = id.hashCode + override final def hashCode: Int = id.hashCode ^ base.hashCode ^ getClass.hashCode override final def equals(o: Any) = o match { - case p: ProjectDefinition[_] => p.getClass == this.getClass && p.id == id + case p: ProjectDefinition[_] => p.getClass == this.getClass && p.id == id && p.base == base case _ => false } }