The great Skylark -> Starlark class migration: lib.skylarkbuildapi.core -> lib.starlarkbuildapi.core PiperOrigin-RevId: 322236111
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD index 99b888c..91a374d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD +++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -417,10 +417,10 @@ "//src/main/java/com/google/devtools/build/lib/skyframe:workspace_status_value", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", "//src/main/java/com/google/devtools/build/lib/syntax:frontend", "//src/main/java/com/google/devtools/build/lib/util", @@ -1094,7 +1094,7 @@ ":transitive_info_provider", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/packages", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", ], )
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java index 6cd3a44..d24204f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
@@ -52,7 +52,7 @@ import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder.ThirdPartyLicenseExistencePolicy; import com.google.devtools.build.lib.packages.SymbolGenerator; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.syntax.StarlarkThread; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDefinition;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoCollection.java index 28ebf73..0ed5b6b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoCollection.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.RequiredProviders; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.StarlarkIndexable; /**
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BUILD b/src/main/java/com/google/devtools/build/lib/packages/BUILD index 3afc9f0..45f33f4 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BUILD +++ b/src/main/java/com/google/devtools/build/lib/packages/BUILD
@@ -53,7 +53,7 @@ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", "//src/main/java/com/google/devtools/build/lib/syntax:frontend", "//src/main/java/com/google/devtools/build/lib/util",
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Provider.java b/src/main/java/com/google/devtools/build/lib/packages/Provider.java index 7d2ab6b..5c2fb2d 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Provider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Provider.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.packages; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Location; /**
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java b/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java index 6aefd8a..4238bec 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java
@@ -16,7 +16,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.collect.Ordering; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.ClassObject; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java b/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java index a4c9877..c196b16 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.packages; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Location;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD index afb5c82..9a46cfc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -104,11 +104,11 @@ "//src/main/java/com/google/devtools/build/lib/skyframe:tree_artifact_value", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/util", "//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code", "//src/main/java/com/google/devtools/build/lib/util:filetype",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/GoogleLegacyStubs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/GoogleLegacyStubs.java index 4788f1c..11c8fdd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/GoogleLegacyStubs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/GoogleLegacyStubs.java
@@ -18,7 +18,6 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcCompilationContextApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcLinkingContextApi; @@ -37,6 +36,7 @@ import com.google.devtools.build.lib.skylarkbuildapi.go.GoContextInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.go.GoPackageInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Printer; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD index 4527fad..e72790d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
@@ -90,8 +90,8 @@ "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_and_data", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/util", "//src/main/java/com/google/devtools/build/lib/util:filetype", "//src/main/java/com/google/devtools/build/lib/util:os", @@ -218,9 +218,9 @@ "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/util", "//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code", "//src/main/java/com/google/devtools/build/lib/util:filetype",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/BootClassPathInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/BootClassPathInfo.java index 034a76c..e855c62 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/BootClassPathInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/BootClassPathInfo.java
@@ -23,7 +23,7 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java index d2b06e6..d85d4eb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
@@ -23,9 +23,9 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.packages.Provider; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaCommonApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaToolchainStarlarkApiProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.Starlark;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/MessageBundleInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/MessageBundleInfo.java index 7598da0..6576bc9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/MessageBundleInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/MessageBundleInfo.java
@@ -23,7 +23,7 @@ import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/BUILD index fcc5cc7..4f816df 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/BUILD
@@ -20,7 +20,6 @@ "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android:srcs", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple:srcs", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config:srcs", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core:srcs", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp:srcs", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java:srcs", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript:srcs", @@ -46,7 +45,7 @@ "//src/main/java/com/google/devtools/build/lib/collect/nestedset", # TODO(cparsons): Remove dependency on Label implementation. "//src/main/java/com/google/devtools/build/lib/cmdline", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", "//third_party:jsr305", ],
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/DefaultInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/DefaultInfoApi.java index bb9baf9..5e4a713 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/DefaultInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/DefaultInfoApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi; import com.google.devtools.build.lib.collect.nestedset.Depset; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkThread; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/OutputGroupInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/OutputGroupInfoApi.java index 3239036..b5f6589 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/OutputGroupInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/OutputGroupInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/ProtoInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/ProtoInfoApi.java index 577af00..65da0b5 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/ProtoInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/ProtoInfoApi.java
@@ -16,8 +16,8 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.collect.nestedset.Depset; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java index 282615a..e3a67ab 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleContextApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleContextApi.java index 0132060..f4e52f6 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleContextApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleContextApi.java
@@ -17,14 +17,14 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ExecGroupCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ToolchainContextApi; import com.google.devtools.build.lib.starlarkbuildapi.BuildConfigurationApi; import com.google.devtools.build.lib.starlarkbuildapi.FileRootApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.ClassObject; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleFunctionsApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleFunctionsApi.java index f29e965..eedb3cc 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleFunctionsApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleFunctionsApi.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkConfigApi.BuildSettingApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.NoneType;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TemplateVariableInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TemplateVariableInfoApi.java index c30b08d..6d3bc90 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TemplateVariableInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TemplateVariableInfoApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkThread;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java index e7e66db..db24d80 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java
@@ -17,9 +17,9 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.skylarkbuildapi.DefaultInfoApi.DefaultInfoApiProvider; import com.google.devtools.build.lib.skylarkbuildapi.OutputGroupInfoApi.OutputGroupInfoApiProvider; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; import com.google.devtools.build.lib.starlarkbuildapi.ActionsInfoProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Starlark; /**
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidApplicationResourceInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidApplicationResourceInfoApi.java index 01dc8de..f5d5c7a 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidApplicationResourceInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidApplicationResourceInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.android; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java index 683cc50..7ca51eb 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java
@@ -17,8 +17,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import javax.annotation.Nullable; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java index 7998dd2..b4d484e 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.android; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java index e459967..f87c0d6 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java
@@ -21,7 +21,7 @@ import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidNativeLibsInfoApi.AndroidNativeLibsInfoApiProvider; import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidResourcesInfoApi.AndroidResourcesInfoApiProvider; import com.google.devtools.build.lib.skylarkbuildapi.android.ApkInfoApi.ApkInfoApiProvider; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.syntax.FlagGuardedValue; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java index 377d7f3..08a941e 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java
@@ -15,9 +15,9 @@ package com.google.devtools.build.lib.skylarkbuildapi.android; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java index c83a7a4..2064060 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
@@ -15,9 +15,9 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.FileProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDeviceBrokerInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDeviceBrokerInfoApi.java index 2d7698e..376f98d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDeviceBrokerInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDeviceBrokerInfoApi.java
@@ -13,8 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.skylarkbuildapi.android; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDex2OatInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDex2OatInfoApi.java index 3d68f40..e612fe3 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDex2OatInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDex2OatInfoApi.java
@@ -15,8 +15,8 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.FilesToRunProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.NoneType; import net.starlark.java.annot.Param; import net.starlark.java.annot.ParamType;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java index dd4bf70..9f1c326 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java
@@ -15,8 +15,8 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java index 8e1a7c8..9c29366 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java
@@ -17,9 +17,9 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; import com.google.devtools.build.lib.skylarkbuildapi.java.OutputJarApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java index 41b74f8..6945ddf 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java
@@ -15,8 +15,8 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidInstrumentationInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidInstrumentationInfoApi.java index 70fa2a7..16e296d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidInstrumentationInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidInstrumentationInfoApi.java
@@ -13,8 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.skylarkbuildapi.android; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java index 3bd1b75..4ae8807 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java
@@ -15,7 +15,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java index 27c0439..74a2847 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java
@@ -15,8 +15,8 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java index e763487..da04489 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.android; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidNativeLibsInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidNativeLibsInfoApi.java index 713c25f..21b2b8dc 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidNativeLibsInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidNativeLibsInfoApi.java
@@ -15,8 +15,8 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java index a8615ba..ca8044f 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.android; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java index 0d5f26f..c571cd2 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java
@@ -15,8 +15,8 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java index 1e5c7b8..cee8845 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java
@@ -16,8 +16,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java index 20d41db..4e6716d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java
@@ -15,9 +15,9 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.FilesToRunProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkValue; import javax.annotation.Nullable;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ApkInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ApkInfoApi.java index cf23d09..50b2e9d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ApkInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ApkInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.android; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/BUILD index 33743cd..9876868 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/BUILD
@@ -24,9 +24,9 @@ "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//third_party:guava", "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/DataBindingV2ProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/DataBindingV2ProviderApi.java index 8fe7505..eacd9fd 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/DataBindingV2ProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/DataBindingV2ProviderApi.java
@@ -16,8 +16,8 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.StarlarkValue;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ProguardMappingProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ProguardMappingProviderApi.java index ae91d40..2edcf5b 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ProguardMappingProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ProguardMappingProviderApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.android; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java index 6fc3c17..efeaf69 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java
@@ -15,8 +15,8 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleBootstrap.java index 25cd1ec..868581f 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleBootstrap.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.apple; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; /** {@link Bootstrap} for Starlark objects related to apple rules. */ public class AppleBootstrap implements Bootstrap {
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleCommonApi.java index a16fdbf..dad9db6 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleCommonApi.java
@@ -21,9 +21,9 @@ import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.apple.AppleStaticLibraryInfoApi.AppleStaticLibraryInfoProvider; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDebugOutputsApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDebugOutputsApi.java index 6cef76a..60f211d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDebugOutputsApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDebugOutputsApi.java
@@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDylibBinaryApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDylibBinaryApi.java index a1b8bb4..b2fa3bb 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDylibBinaryApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDylibBinaryApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.apple; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDynamicFrameworkInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDynamicFrameworkInfoApi.java index dbaaa6a..2206f4b 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDynamicFrameworkInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleDynamicFrameworkInfoApi.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import javax.annotation.Nullable; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleExecutableBinaryApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleExecutableBinaryApi.java index 8695a3a..f8cb2a64 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleExecutableBinaryApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleExecutableBinaryApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.apple; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleLoadableBundleBinaryApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleLoadableBundleBinaryApi.java index 0289417..09c2628 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleLoadableBundleBinaryApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleLoadableBundleBinaryApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.apple; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleStaticLibraryInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleStaticLibraryInfoApi.java index 5b23cdf..9b02ea5 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleStaticLibraryInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleStaticLibraryInfoApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.apple; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/BUILD index 437775f..5e44554 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/BUILD
@@ -21,7 +21,7 @@ srcs = glob(["*.java"]), deps = [ "//third_party:guava", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", # TODO(b/80307387): Remove dependency on Depset.
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/XcodeConfigInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/XcodeConfigInfoApi.java index 62b7709..5e60542 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/XcodeConfigInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/XcodeConfigInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.apple; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/XcodePropertiesApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/XcodePropertiesApi.java index 4405169..6bb8676 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/XcodePropertiesApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/XcodePropertiesApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.apple; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import javax.annotation.Nullable; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/BUILD index 60a718d..0f4922b 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/BUILD
@@ -22,7 +22,7 @@ deps = [ "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//third_party:guava", ],
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigBootstrap.java index cdee6a4..5f9f26f 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigBootstrap.java
@@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableMap.Builder; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkConfigApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.syntax.Starlark; /**
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigFeatureFlagProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigFeatureFlagProviderApi.java index 9f53822..85321bb 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigFeatureFlagProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigFeatureFlagProviderApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.config; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigStarlarkCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigStarlarkCommonApi.java index 99eda4b..1639bbb 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigStarlarkCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config/ConfigStarlarkCommonApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.config; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BUILD index eb9f70d..7644639 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BUILD
@@ -24,9 +24,9 @@ "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//third_party:guava", "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcBootstrap.java index 272d485..8f8c6f9 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcBootstrap.java
@@ -18,8 +18,8 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.syntax.FlagGuardedValue; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcInfoApi.java index 7f21b98..026bf35 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcInfoApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.cpp; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.NoneType; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java index 4ebdf22..a6ea13f 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java
@@ -19,8 +19,8 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.NoneType;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcToolchainConfigInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcToolchainConfigInfoApi.java index c66da2e..005845d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcToolchainConfigInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcToolchainConfigInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.cpp; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoCcLinkParamsInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoCcLinkParamsInfoApi.java index 696af30..82c9cb9 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoCcLinkParamsInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoCcLinkParamsInfoApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.cpp; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcHelperApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcHelperApi.java index 9f95e21..5f7e792 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcHelperApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcHelperApi.java
@@ -18,11 +18,11 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.go.GoConfigurationApi; import com.google.devtools.build.lib.skylarkbuildapi.go.GoContextInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.go.GoPackageInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.NoneType; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcInfoApi.java index d2cd02f..7d9d853 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcInfoApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.cpp; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyCcLinkParamsProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyCcLinkParamsProviderApi.java index 6ac64d9..c3ddedf 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyCcLinkParamsProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyCcLinkParamsProviderApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.cpp; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyWrapCcInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyWrapCcInfoApi.java index d74b22f..ec7860a 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyWrapCcInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyWrapCcInfoApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.cpp; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/WrapCcIncludeProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/WrapCcIncludeProviderApi.java index 535bd23..500c407 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/WrapCcIncludeProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/WrapCcIncludeProviderApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.cpp; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/BUILD index a7c02f6..f377a19 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/BUILD
@@ -21,7 +21,7 @@ srcs = glob(["*.java"]), deps = [ "//src/main/java/com/google/devtools/build/lib:syntax", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", ], )
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/GoContextInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/GoContextInfoApi.java index bbe7cbc..19fbc9b 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/GoContextInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/GoContextInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.go; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/GoPackageInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/GoPackageInfoApi.java index 1f0ba6c..7d58209 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/GoPackageInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go/GoPackageInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.go; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/BUILD index ba2af38..4d5d497 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/BUILD
@@ -24,9 +24,9 @@ "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//third_party:guava", "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java index d1920bd..ef72917 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java
@@ -16,8 +16,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaBootstrap.java index e07b885..5962370 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaBootstrap.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.java; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaInfoApi.JavaInfoProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; /** {@link Bootstrap} for Starlark objects related to the java language. */ public class JavaBootstrap implements Bootstrap {
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCcLinkParamsProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCcLinkParamsProviderApi.java index ef64d7c..190111a 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCcLinkParamsProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCcLinkParamsProviderApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.java; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier; import com.google.devtools.build.lib.syntax.StarlarkValue;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java index bad6464..26c761d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java
@@ -20,8 +20,8 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.StarlarkSemantics;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaInfoApi.java index 7180299..990ed82 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaInfoApi.java
@@ -16,8 +16,8 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.StarlarkThread;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaNativeLibraryInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaNativeLibraryInfoApi.java index 0d919ed..f8bf7f0 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaNativeLibraryInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaNativeLibraryInfoApi.java
@@ -16,9 +16,9 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.LibraryToLinkApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java index fcd0553..602fa1c 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java
@@ -16,8 +16,8 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.Param;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/ProguardSpecProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/ProguardSpecProviderApi.java index 6533443..7e54458 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/ProguardSpecProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/ProguardSpecProviderApi.java
@@ -15,8 +15,8 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript/BUILD index b1a99e7..29738d0 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript/BUILD
@@ -23,7 +23,7 @@ "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", ], )
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript/JsModuleInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript/JsModuleInfoApi.java index 7a04ec0..a158ec8 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript/JsModuleInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/javascript/JsModuleInfoApi.java
@@ -16,8 +16,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/BUILD index 31cb27d..bc16ea0 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/BUILD
@@ -22,7 +22,7 @@ deps = [ "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/cmdline", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//third_party:guava", "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ConstraintSettingInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ConstraintSettingInfoApi.java index f21ae45..46f275e 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ConstraintSettingInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ConstraintSettingInfoApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.platform; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier; import javax.annotation.Nullable; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ConstraintValueInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ConstraintValueInfoApi.java index 967b75e..e9bb539 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ConstraintValueInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ConstraintValueInfoApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.platform; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformBootstrap.java index e0c44e0..77f0d1f 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformBootstrap.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.platform; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; /** {@link Bootstrap} for Starlark objects related to platforms. */ public class PlatformBootstrap implements Bootstrap {
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformCommonApi.java index 1447ab6..09996d0 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformCommonApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.platform; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformInfoApi.java index 88d9b72..18eaafd 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/PlatformInfoApi.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.platform; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ToolchainInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ToolchainInfoApi.java index 5a243fb..3c50266 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ToolchainInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ToolchainInfoApi.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.skylarkbuildapi.platform; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkThread;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ToolchainTypeInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ToolchainTypeInfoApi.java index b4544ad..a3329df 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ToolchainTypeInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ToolchainTypeInfoApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.platform; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/BUILD index 2006615..771cf2c 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/BUILD
@@ -23,7 +23,7 @@ "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//third_party:guava", ],
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoBootstrap.java index 39fa848..5a6e07f 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoBootstrap.java
@@ -17,8 +17,8 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.skylarkbuildapi.ProtoInfoApi.ProtoInfoProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.FlagGuardedValue; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoRegistryProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoRegistryProviderApi.java index 8fc59ff..b8b8bc2 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoRegistryProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoRegistryProviderApi.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Sequence; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/BUILD index 3d83400..ce3cb0d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/BUILD
@@ -23,7 +23,7 @@ "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//third_party:guava", "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyBootstrap.java index dc5fcfb..d99f430 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyBootstrap.java
@@ -15,9 +15,9 @@ package com.google.devtools.build.lib.skylarkbuildapi.python; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.skylarkbuildapi.python.PyInfoApi.PyInfoProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.python.PyRuntimeInfoApi.PyRuntimeInfoProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.syntax.FlagGuardedValue; import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyInfoApi.java index 74cd4c5..de76e43 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyInfoApi.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkThread; import com.google.devtools.build.lib.syntax.StarlarkValue;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyRuntimeInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyRuntimeInfoApi.java index 1115859..160185d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyRuntimeInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/python/PyRuntimeInfoApi.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.StarlarkThread; import com.google.devtools.build.lib.syntax.StarlarkValue;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/BUILD index 157e8c84..6e20a94 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/BUILD
@@ -21,7 +21,7 @@ srcs = glob(["*.java"]), deps = [ "//third_party:guava", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//src/main/java/com/google/devtools/build/lib:syntax", # TODO(cparsons): Remove dependency on Label implementation.
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/RepositoryBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/RepositoryBootstrap.java index ce6aaa4..a7965a9 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/RepositoryBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/RepositoryBootstrap.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.repository; import com.google.common.collect.ImmutableMap.Builder; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.syntax.Starlark; /**
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/StarlarkRepositoryContextApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/StarlarkRepositoryContextApi.java index d502ea6..fc9d849 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/StarlarkRepositoryContextApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository/StarlarkRepositoryContextApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.repository; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/BUILD index d5b3c96..621e60b 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/BUILD
@@ -21,6 +21,6 @@ deps = [ "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", ], )
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/ProviderStub.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/ProviderStub.java index 7c8544b..6eb5b31 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/ProviderStub.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/ProviderStub.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.stubs; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Printer; /**
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/AnalysisFailureInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/AnalysisFailureInfoApi.java index dbda403..9c4b7b0 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/AnalysisFailureInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/AnalysisFailureInfoApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.test; import com.google.devtools.build.lib.collect.nestedset.Depset; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/AnalysisTestResultInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/AnalysisTestResultInfoApi.java index 4f44325..79955a2 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/AnalysisTestResultInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/AnalysisTestResultInfoApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.test; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/BUILD b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/BUILD index 661bf04..26bafa3 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/BUILD
@@ -24,7 +24,7 @@ # TODO(b/80307387): Remove dependency on Label implementation. "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", "//src/main/java/net/starlark/java/annot", "//src/main/java/com/google/devtools/build/lib:syntax",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/ExecutionInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/ExecutionInfoApi.java index c6b0594..2b603cd 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/ExecutionInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/ExecutionInfoApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.test; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/InstrumentedFilesInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/InstrumentedFilesInfoApi.java index 2c00bc9..c05ef19 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/InstrumentedFilesInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/InstrumentedFilesInfoApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.test; import com.google.devtools.build.lib.collect.nestedset.Depset; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/TestEnvironmentInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/TestEnvironmentInfoApi.java index 5dd64be..67cf994 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/TestEnvironmentInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/TestEnvironmentInfoApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.test; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import java.util.Map; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkMethod;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/TestingBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/TestingBootstrap.java index 3de125a..827e70f 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/TestingBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/TestingBootstrap.java
@@ -15,10 +15,10 @@ package com.google.devtools.build.lib.skylarkbuildapi.test; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.test.AnalysisFailureInfoApi.AnalysisFailureInfoProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.test.AnalysisTestResultInfoApi.AnalysisTestResultInfoProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; /** {@link Bootstrap} for Starlark objects related to testing. */ public class TestingBootstrap implements Bootstrap {
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/ActionsInfoProviderApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/ActionsInfoProviderApi.java index a272576..d1e91a2 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/ActionsInfoProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/ActionsInfoProviderApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.starlarkbuildapi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory;
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD index 72e0f34..d1ef623 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD
@@ -16,7 +16,9 @@ filegroup( name = "srcs", - srcs = glob(["**"]), + srcs = glob(["**"]) + [ + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core:srcs", + ], visibility = ["//src:__subpackages__"], ) @@ -30,7 +32,7 @@ "//src/main/java/com/google/devtools/build/lib/collect/nestedset", # TODO(cparsons): Remove dependency on Label implementation. "//src/main/java/com/google/devtools/build/lib/cmdline", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", "//third_party:jsr305", ],
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/BUILD similarity index 96% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/BUILD rename to src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/BUILD index 550612f..574e52c 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/BUILD +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/BUILD
@@ -8,7 +8,7 @@ # # This package contains core types that will be needed by other APIs, such as # StructApi and ProviderApi. Only add new types that will be widely used by -# other parts of the skylarkbuildapi. +# other parts of the starlarkbuildapi. load("@rules_java//java:defs.bzl", "java_library")
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/Bootstrap.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/Bootstrap.java similarity index 94% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/Bootstrap.java rename to src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/Bootstrap.java index 6613e9c..f598b13 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/Bootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/Bootstrap.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.skylarkbuildapi.core; +package com.google.devtools.build.lib.starlarkbuildapi.core; import com.google.common.collect.ImmutableMap;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/ProviderApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/ProviderApi.java similarity index 96% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/ProviderApi.java rename to src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/ProviderApi.java index 494f505..b79e638 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/ProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/ProviderApi.java
@@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.skylarkbuildapi.core; +package com.google.devtools.build.lib.starlarkbuildapi.core; import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/StructApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/StructApi.java similarity index 98% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/StructApi.java rename to src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/StructApi.java index 2bafa53..943a766 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/StructApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/StructApi.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.skylarkbuildapi.core; +package com.google.devtools.build.lib.starlarkbuildapi.core; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/TransitiveInfoCollectionApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/TransitiveInfoCollectionApi.java similarity index 97% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/TransitiveInfoCollectionApi.java rename to src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/TransitiveInfoCollectionApi.java index 03ab567..2445636 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core/TransitiveInfoCollectionApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core/TransitiveInfoCollectionApi.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.skylarkbuildapi.core; +package com.google.devtools.build.lib.starlarkbuildapi.core; import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.StarlarkBuiltin;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/BUILD b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/BUILD index 4a7b017..41b2296 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/BUILD +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/BUILD
@@ -20,8 +20,8 @@ "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/events", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/skydoc/rendering", "//src/main/java/com/google/devtools/build/skydoc/rendering/proto:stardoc_output_java_proto", "//third_party:guava",
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeProviderApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeProviderApi.java index dd600b5..e7ce53e 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeProviderApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeProviderApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.skydoc.fakebuildapi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.Printer; import com.google.devtools.build.lib.syntax.StarlarkCallable;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAttrModuleApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAttrModuleApi.java index 0a0698c..2ecdc89 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAttrModuleApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAttrModuleApi.java
@@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAttrModuleApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Module;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java index 51e8eb0..fef3127 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java
@@ -22,7 +22,7 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleFunctionsApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Location;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStructApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStructApi.java index 70ad497..38fd011 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStructApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStructApi.java
@@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Ordering; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.ClassObject; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/BUILD b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/BUILD index 8c37a47..aa968e9 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/BUILD +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/BUILD
@@ -19,9 +19,9 @@ "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/skydoc/fakebuildapi", "//third_party:guava", ],
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/FakeAppleCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/FakeAppleCommon.java index 1b1eb62..75cecb1 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/FakeAppleCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/FakeAppleCommon.java
@@ -27,9 +27,9 @@ import com.google.devtools.build.lib.skylarkbuildapi.apple.DottedVersionApi; import com.google.devtools.build.lib.skylarkbuildapi.apple.ObjcProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.apple.XcodeConfigInfoApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.StarlarkThread;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/BUILD b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/BUILD index 5380716..447f3ee 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/BUILD +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/BUILD
@@ -18,7 +18,7 @@ "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/events", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/config", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/skydoc/fakebuildapi", ], )
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/FakeConfigStarlarkCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/FakeConfigStarlarkCommon.java index 5aa99e9..8b7856b 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/FakeConfigStarlarkCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/FakeConfigStarlarkCommon.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.skydoc.fakebuildapi.config; import com.google.devtools.build.lib.skylarkbuildapi.config.ConfigStarlarkCommonApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeProviderApi; /**
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/BUILD b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/BUILD index 13b9b87..baea2b9 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/BUILD +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/BUILD
@@ -20,10 +20,10 @@ "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/events", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/go", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/skydoc/fakebuildapi", "//third_party:guava", ],
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java index 1757ee1..270ab30 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java
@@ -18,7 +18,6 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.BazelCcModuleApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcCompilationContextApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcCompilationOutputsApi; @@ -33,6 +32,7 @@ import com.google.devtools.build.lib.skylarkbuildapi.cpp.LibraryToLinkApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.LinkerInputApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeGoWrapCcHelper.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeGoWrapCcHelper.java index c2324c8..0b8fb77 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeGoWrapCcHelper.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeGoWrapCcHelper.java
@@ -18,7 +18,6 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcCompilationContextApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcLinkingContextApi; @@ -33,6 +32,7 @@ import com.google.devtools.build.lib.skylarkbuildapi.go.GoContextInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.go.GoPackageInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.Tuple;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/BUILD b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/BUILD index 6650a5f..9ba3237 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/BUILD +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/BUILD
@@ -20,10 +20,10 @@ "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/events", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/skydoc/fakebuildapi", "//third_party:guava", "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaCommon.java index ee7dba9..17a102f 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaCommon.java
@@ -20,10 +20,10 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaCommonApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaToolchainStarlarkApiProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.StarlarkThread;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaProtoCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaProtoCommon.java index f871347..4d82ff4 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaProtoCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaProtoCommon.java
@@ -16,10 +16,10 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; -import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaProtoCommonApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.syntax.EvalException; /** Fake implementation of {@link JavaProtoCommonApi}. */
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/platform/BUILD b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/platform/BUILD index 7be047d..e732ee8 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/platform/BUILD +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/platform/BUILD
@@ -15,8 +15,8 @@ name = "platform", srcs = glob(["*.java"]), deps = [ - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/skydoc/fakebuildapi", ], )
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/platform/FakePlatformCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/platform/FakePlatformCommon.java index 8821e8b..20f4926 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/platform/FakePlatformCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/platform/FakePlatformCommon.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.skydoc.fakebuildapi.platform; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.PlatformCommonApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeProviderApi; /**
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/BUILD b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/BUILD index 9fad7db..bb0b184 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/BUILD +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/BUILD
@@ -17,9 +17,9 @@ deps = [ "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//third_party:guava", ], )
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/FakeInstrumentedFilesInfoProvider.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/FakeInstrumentedFilesInfoProvider.java index 212e1a2..7502223 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/FakeInstrumentedFilesInfoProvider.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/FakeInstrumentedFilesInfoProvider.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.skydoc.fakebuildapi.test; -import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; +import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Printer; /** Fake implementation of {@link InstrumentedFilesInfoProviderApi}. */