From 36db1207cf278b2c3945150f2a2aab27b5c3ed43 Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Thu, 10 Apr 2014 20:21:42 +0200 Subject: [PATCH] Move NameHashing from incremental to api subproject. It should have been there from the beginning because NameHashing is tied to internals of the API subproject. It was added to incremental subproject by mistake. --- .../inc => api/src/main/scala/xsbt/api}/NameHashing.scala | 7 +++++-- .../test/scala/xsbt/api}/NameHashingSpecification.scala | 3 +-- compile/inc/src/main/scala/sbt/inc/Compile.scala | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename compile/{inc/src/main/scala/sbt/inc => api/src/main/scala/xsbt/api}/NameHashing.scala (96%) rename compile/{inc/src/test/scala/sbt/inc => api/src/test/scala/xsbt/api}/NameHashingSpecification.scala (99%) diff --git a/compile/inc/src/main/scala/sbt/inc/NameHashing.scala b/compile/api/src/main/scala/xsbt/api/NameHashing.scala similarity index 96% rename from compile/inc/src/main/scala/sbt/inc/NameHashing.scala rename to compile/api/src/main/scala/xsbt/api/NameHashing.scala index da998af2b..68e4933c4 100644 --- a/compile/inc/src/main/scala/sbt/inc/NameHashing.scala +++ b/compile/api/src/main/scala/xsbt/api/NameHashing.scala @@ -1,4 +1,4 @@ -package sbt.inc +package xsbt.api import xsbti.api.SourceAPI import xsbti.api.Definition @@ -6,7 +6,10 @@ import xsbti.api.DefinitionType import xsbti.api.ClassLike import xsbti.api._internalOnly_NameHash import xsbti.api._internalOnly_NameHashes -import xsbt.api.Visit +import xsbti.api.DefinitionType.ClassDef +import xsbti.api.DefinitionType.Module +import xsbti.api.DefinitionType.PackageModule +import xsbti.api.DefinitionType.Trait /** * A class that computes hashes for each group of definitions grouped by a simple name. diff --git a/compile/inc/src/test/scala/sbt/inc/NameHashingSpecification.scala b/compile/api/src/test/scala/xsbt/api/NameHashingSpecification.scala similarity index 99% rename from compile/inc/src/test/scala/sbt/inc/NameHashingSpecification.scala rename to compile/api/src/test/scala/xsbt/api/NameHashingSpecification.scala index 3a6e93827..1eddaec7d 100644 --- a/compile/inc/src/test/scala/sbt/inc/NameHashingSpecification.scala +++ b/compile/api/src/test/scala/xsbt/api/NameHashingSpecification.scala @@ -1,8 +1,7 @@ -package sbt.inc +package xsbt.api import org.junit.runner.RunWith import xsbti.api._ -import xsbt.api.HashAPI import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner diff --git a/compile/inc/src/main/scala/sbt/inc/Compile.scala b/compile/inc/src/main/scala/sbt/inc/Compile.scala index 925e8fd3d..95d9c31b1 100644 --- a/compile/inc/src/main/scala/sbt/inc/Compile.scala +++ b/compile/inc/src/main/scala/sbt/inc/Compile.scala @@ -154,7 +154,7 @@ private final class AnalysisCallback(internalMap: File => Option[File], external if (APIUtil.isScalaSourceName(sourceFile.getName) && APIUtil.hasMacro(source)) macroSources += sourceFile publicNameHashes(sourceFile) = { if (nameHashing) - (new NameHashing).nameHashes(source) + (new xsbt.api.NameHashing).nameHashes(source) else emptyNameHashes }