From 4b8a6b3358dab1be6415a27cea9f4a310bdae422 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Wed, 16 Oct 2024 10:51:26 +0800 Subject: [PATCH 1/2] . --- .../main/scala/sbt/internal/inc/IncrementalCommon.scala | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala index dfe6a869f..19cfff70e 100644 --- a/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala +++ b/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala @@ -534,14 +534,7 @@ private[inc] abstract class IncrementalCommon( val removedClasses = classNames(removedSrcs) val dependentOnRemovedClasses = removedClasses.flatMap(previous.memberRef.internal.reverse) val modifiedClasses = classNames(modifiedSrcs) - val mutualDependentOnModifiedClasses = { - val dependentOnModifiedClasses = modifiedClasses.flatMap(previous.memberRef.internal.reverse) - dependentOnModifiedClasses.filter(dependent => - previous.memberRef.internal.reverse(dependent).exists(modifiedClasses) - ) - } - val invalidatedClasses = - removedClasses ++ dependentOnRemovedClasses ++ modifiedClasses ++ mutualDependentOnModifiedClasses + val invalidatedClasses = removedClasses ++ dependentOnRemovedClasses ++ modifiedClasses val byProduct = changes.removedProducts.flatMap(previous.produced) val byLibraryDep = changes.libraryDeps.flatMap(previous.usesLibrary) From 3e3050f94525676e7b399c2bd3325112efc49d7b Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Thu, 17 Oct 2024 08:46:45 +0800 Subject: [PATCH 2/2] renames --- .../source-dependencies/abstract-class-to-trait/{test => pending} | 0 .../sbt-test/source-dependencies/false-error/{test => pending} | 0 .../source-dependencies/nested-type-params/{test => pending} | 0 .../source-dependencies/no-type-annotation/{test => pending} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename zinc/src/sbt-test/source-dependencies/abstract-class-to-trait/{test => pending} (100%) rename zinc/src/sbt-test/source-dependencies/false-error/{test => pending} (100%) rename zinc/src/sbt-test/source-dependencies/nested-type-params/{test => pending} (100%) rename zinc/src/sbt-test/source-dependencies/no-type-annotation/{test => pending} (100%) diff --git a/zinc/src/sbt-test/source-dependencies/abstract-class-to-trait/test b/zinc/src/sbt-test/source-dependencies/abstract-class-to-trait/pending similarity index 100% rename from zinc/src/sbt-test/source-dependencies/abstract-class-to-trait/test rename to zinc/src/sbt-test/source-dependencies/abstract-class-to-trait/pending diff --git a/zinc/src/sbt-test/source-dependencies/false-error/test b/zinc/src/sbt-test/source-dependencies/false-error/pending similarity index 100% rename from zinc/src/sbt-test/source-dependencies/false-error/test rename to zinc/src/sbt-test/source-dependencies/false-error/pending diff --git a/zinc/src/sbt-test/source-dependencies/nested-type-params/test b/zinc/src/sbt-test/source-dependencies/nested-type-params/pending similarity index 100% rename from zinc/src/sbt-test/source-dependencies/nested-type-params/test rename to zinc/src/sbt-test/source-dependencies/nested-type-params/pending diff --git a/zinc/src/sbt-test/source-dependencies/no-type-annotation/test b/zinc/src/sbt-test/source-dependencies/no-type-annotation/pending similarity index 100% rename from zinc/src/sbt-test/source-dependencies/no-type-annotation/test rename to zinc/src/sbt-test/source-dependencies/no-type-annotation/pending