diff --git a/base/src/com/google/idea/blaze/base/qsync/ProjectLoader.java b/base/src/com/google/idea/blaze/base/qsync/ProjectLoader.java index 56a5ed6c60e..ff331c466a1 100644 --- a/base/src/com/google/idea/blaze/base/qsync/ProjectLoader.java +++ b/base/src/com/google/idea/blaze/base/qsync/ProjectLoader.java @@ -151,7 +151,11 @@ public QuerySyncProject loadProject(BlazeContext context) throws BuildException RenderJarArtifactTracker renderJarArtifactTracker; AppInspectorArtifactTracker appInspectorArtifactTracker; if (QuerySync.USE_NEW_BUILD_ARTIFACT_MANAGEMENT) { - artifactTracker = new NewArtifactTracker<>(); + NewArtifactTracker tracker = + new NewArtifactTracker<>( + BlazeDataStorage.getProjectDataDir(importSettings).toPath(), artifactCache, executor); + + artifactTracker = tracker; renderJarArtifactTracker = new RenderJarArtifactTrackerImpl(); appInspectorArtifactTracker = new AppInspectorArtifactTrackerImpl(); } else { diff --git a/base/src/com/google/idea/blaze/base/qsync/cache/ArtifactTrackerImpl.java b/base/src/com/google/idea/blaze/base/qsync/cache/ArtifactTrackerImpl.java index 247934426b1..f2e8dea58e9 100644 --- a/base/src/com/google/idea/blaze/base/qsync/cache/ArtifactTrackerImpl.java +++ b/base/src/com/google/idea/blaze/base/qsync/cache/ArtifactTrackerImpl.java @@ -72,6 +72,7 @@ import com.google.idea.blaze.exception.BuildException; import com.google.idea.blaze.qsync.ProjectProtoTransform; import com.google.idea.blaze.qsync.TestSourceGlobMatcher; +import com.google.idea.blaze.qsync.artifacts.BuildArtifact; import com.google.idea.blaze.qsync.cc.CcDependenciesInfo; import com.google.idea.blaze.qsync.deps.ArtifactTracker; import com.google.idea.blaze.qsync.deps.OutputGroup; @@ -283,10 +284,11 @@ private void loadFromDisk() { .collect(toImmutableMap(e -> Path.of(e.getKey()), e -> Path.of(e.getValue())))); javaArtifacts.putAll( saved.getArtifactInfo().getArtifactsList().stream() - .map(JavaArtifactInfo::create) + .map(p -> JavaArtifactInfo.create(p, BuildArtifact.NO_DIGESTS)) .collect(toImmutableMap(JavaArtifactInfo::label, Function.identity()))); for (JavaTargetArtifacts targetArtifact : saved.getArtifactInfo().getArtifactsList()) { - JavaArtifactInfo javaArtifactInfo = JavaArtifactInfo.create(targetArtifact); + JavaArtifactInfo javaArtifactInfo = + JavaArtifactInfo.create(targetArtifact, BuildArtifact.NO_DIGESTS); javaArtifacts.put(javaArtifactInfo.label(), javaArtifactInfo); } ccDepencenciesInfo = CcDependenciesInfo.create(saved.getCcCompilationInfo()); @@ -615,7 +617,8 @@ private ImmutableListMultimap getGensrcsByInclusion( */ private void updateMaps(Set