Make some skyframe and lib/skyframe classes public.
--
MOS_MIGRATED_REVID=99197069
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingFunction.java
index 93c3d75..46eb6f3 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingFunction.java
@@ -24,7 +24,7 @@
/**
* A {@link SkyFunction} for {@link DirectoryListingValue}s.
*/
-final class DirectoryListingFunction implements SkyFunction {
+public final class DirectoryListingFunction implements SkyFunction {
@Override
public SkyValue compute(SkyKey skyKey, Environment env)
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java
index 745df28..ab25cd8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java
@@ -26,14 +26,13 @@
import java.util.concurrent.atomic.AtomicReference;
/** Common utilities for dealing with files outside the package roots. */
-class ExternalFilesHelper {
+public class ExternalFilesHelper {
private final AtomicReference<PathPackageLocator> pkgLocator;
private final Set<Path> immutableDirs;
private final boolean errorOnExternalFiles;
- @VisibleForTesting
- ExternalFilesHelper(AtomicReference<PathPackageLocator> pkgLocator) {
+ public ExternalFilesHelper(AtomicReference<PathPackageLocator> pkgLocator) {
this(pkgLocator, ImmutableSet.<Path>of(), /*errorOnExternalFiles=*/false);
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
index 942a201..7e80689 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
@@ -39,7 +39,7 @@
*
* <p>This code drives the glob matching process.
*/
-final class GlobFunction implements SkyFunction {
+public final class GlobFunction implements SkyFunction {
private final Cache<String, Pattern> regexPatternCache =
CacheBuilder.newBuilder().concurrencyLevel(4).build();
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
index 2c8cc8e..40bbdb6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
@@ -39,11 +39,11 @@
/**
* SkyFunction for {@link PackageLookupValue}s.
*/
-class PackageLookupFunction implements SkyFunction {
+public class PackageLookupFunction implements SkyFunction {
private final AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages;
- PackageLookupFunction(AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages) {
+ public PackageLookupFunction(AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages) {
this.deletedPackages = deletedPackages;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
index 8b0d0ad..e94cfdb 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
@@ -72,10 +72,10 @@
return new Injected(precomputed, Suppliers.ofInstance(value));
}
- static final Precomputed<String> DEFAULTS_PACKAGE_CONTENTS =
+ public static final Precomputed<String> DEFAULTS_PACKAGE_CONTENTS =
new Precomputed<>(new SkyKey(SkyFunctions.PRECOMPUTED, "default_pkg"));
- static final Precomputed<RuleVisibility> DEFAULT_VISIBILITY =
+ public static final Precomputed<RuleVisibility> DEFAULT_VISIBILITY =
new Precomputed<>(new SkyKey(SkyFunctions.PRECOMPUTED, "default_visibility"));
static final Precomputed<UUID> BUILD_ID =
@@ -173,7 +173,7 @@
/**
* Injects a new variable value.
*/
- void set(Injectable injectable, T value) {
+ public void set(Injectable injectable, T value) {
injectable.inject(ImmutableMap.of(key, new PrecomputedValue(value)));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
index 59d864a..945ce42 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
@@ -41,7 +41,7 @@
private final Path installDir;
private final RuleClassProvider ruleClassProvider;
- WorkspaceFileFunction(
+ public WorkspaceFileFunction(
RuleClassProvider ruleClassProvider,
PackageFactory packageFactory,
BlazeDirectories directories) {
diff --git a/src/main/java/com/google/devtools/build/skyframe/Differencer.java b/src/main/java/com/google/devtools/build/skyframe/Differencer.java
index b520f16..6658eb1 100644
--- a/src/main/java/com/google/devtools/build/skyframe/Differencer.java
+++ b/src/main/java/com/google/devtools/build/skyframe/Differencer.java
@@ -24,7 +24,7 @@
/**
* Represents a set of changed values.
*/
- interface Diff {
+ public interface Diff {
/**
* Returns the value keys whose values have changed, but for which we don't have the new values.
*/
