commit 18694cd7a94597dcd04f1224635fa66129b6acf6
author gregce <gregce@google.com> Tue May 12 15:40:05 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 12 15:41:01 2020 -0700
tree 327732ee45593b8858d191205d9aff76a17680b4
parent 058dd91d33c010f28ffaf848a6c63110d39299ec

The great Skylark -> Starlark class migration:
  SkylarkConfigurationField
  SkylarkConfigurationFieldProcessor
  SkylarkAspectClass
  AndroidSkylarkCommon
  ConfigSkylarkCommon
  AndroidSkylarkCommonApi
  ConfigSkylarkCommonApi
  FakeAndroidSkylarkCommon
  FakeConfigSkylarkCommon
  SkylarkConfigurationFieldProcessorTest
  AndroidSkylarkCommonTest
  Attribute.SkylarkRuleAspect
  Attribute.SkylarkComputedDefaultTemplate
  Attribute.SkylarkComputedDefault

PiperOrigin-RevId: 311216560

src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
index e4f7f1a..aa8d0bd 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
@@ -279,7 +279,7 @@
      * Starlark providers.
      */
     public Builder requireSkylarkProviders(StarlarkProviderIdentifier... skylarkProviders) {
-      requiredProviders.addSkylarkSet(ImmutableSet.copyOf(skylarkProviders));
+      requiredProviders.addStarlarkSet(ImmutableSet.copyOf(skylarkProviders));
       return this;
     }
 
@@ -287,7 +287,7 @@
         Iterable<ImmutableSet<StarlarkProviderIdentifier>> providerSets) {
       for (ImmutableSet<StarlarkProviderIdentifier> providerSet : providerSets) {
         if (!providerSet.isEmpty()) {
-          requiredAspectProviders.addSkylarkSet(providerSet);
+          requiredAspectProviders.addStarlarkSet(providerSet);
         }
       }
       return this;