Code cleanup on skylarkbuildapi classes. Removed redundant "abstract" and "public static" modifiers. PiperOrigin-RevId: 284653823
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 09ff707..d8b64ce 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
@@ -45,170 +45,150 @@ @SkylarkCallable( name = "apple_toolchain", - doc = "Utilities for resolving items from the apple toolchain." - ) - public AppleToolchainApi<?> getAppleToolchain(); + doc = "Utilities for resolving items from the apple toolchain.") + AppleToolchainApi<?> getAppleToolchain(); @SkylarkCallable( - name = "platform_type", - doc = - "An enum-like struct that contains the following fields corresponding to Apple platform " - + "types:<br><ul>" - + "<li><code>ios</code></li>" - + "<li><code>macos</code></li>" - + "<li><code>tvos</code></li>" - + "<li><code>watchos</code></li>" - + "</ul><p>" - + "These values can be passed to methods that expect a platform type, like the 'apple' " - + "configuration fragment's " - + "<a href='apple.html#multi_arch_platform'>multi_arch_platform</a> method.<p>" - + "Example:<p>" - + "<pre class='language-python'>\n" - + "ctx.fragments.apple.multi_arch_platform(apple_common.platform_type.ios)\n" - + "</pre>", - structField = true - ) - public StructApi getPlatformTypeStruct(); + name = "platform_type", + doc = + "An enum-like struct that contains the following fields corresponding to Apple platform " + + "types:<br><ul><li><code>ios</code></li><li><code>macos</code></li>" + + "<li><code>tvos</code></li><li><code>watchos</code></li></ul><p>These values can" + + " be passed to methods that expect a platform type, like the 'apple' configuration" + + " fragment's <a href='apple.html#multi_arch_platform'>multi_arch_platform</a>" + + " method.<p>Example:<p><pre class='language-python'>\n" + + "ctx.fragments.apple.multi_arch_platform(apple_common.platform_type.ios)\n" + + "</pre>", + structField = true) + StructApi getPlatformTypeStruct(); @SkylarkCallable( - name = "platform", - doc = - "An enum-like struct that contains the following fields corresponding to Apple " - + "platforms:<br><ul>" - + "<li><code>ios_device</code></li>" - + "<li><code>ios_simulator</code></li>" - + "<li><code>macos</code></li>" - + "<li><code>tvos_device</code></li>" - + "<li><code>tvos_simulator</code></li>" - + "<li><code>watchos_device</code></li>" - + "<li><code>watchos_device</code></li>" - + "</ul><p>" - + "These values can be passed to methods that expect a platform, like " - + "<a href='apple.html#sdk_version_for_platform'>apple.sdk_version_for_platform</a>.", - structField = true - ) - public StructApi getPlatformStruct(); + name = "platform", + doc = + "An enum-like struct that contains the following fields corresponding to Apple " + + "platforms:<br><ul>" + + "<li><code>ios_device</code></li>" + + "<li><code>ios_simulator</code></li>" + + "<li><code>macos</code></li>" + + "<li><code>tvos_device</code></li>" + + "<li><code>tvos_simulator</code></li>" + + "<li><code>watchos_device</code></li>" + + "<li><code>watchos_device</code></li>" + + "</ul><p>" + + "These values can be passed to methods that expect a platform, like " + + "<a href='apple.html#sdk_version_for_platform'>apple.sdk_version_for_platform</a>.", + structField = true) + StructApi getPlatformStruct(); @SkylarkCallable( - name = "XcodeProperties", - doc = - "The constructor/key for the <code>XcodeVersionProperties</code> provider.<p>" - + "If a target propagates the <code>XcodeVersionProperties</code> provider," - + " use this as the key with which to retrieve it. Example:<br>" - + "<pre class='language-python'>\n" - + "dep = ctx.attr.deps[0]\n" - + "p = dep[apple_common.XcodeVersionProperties]\n" - + "</pre>", - structField = true - ) - public ProviderApi getXcodeVersionPropertiesConstructor(); + name = "XcodeProperties", + doc = + "The constructor/key for the <code>XcodeVersionProperties</code> provider.<p>" + + "If a target propagates the <code>XcodeVersionProperties</code> provider," + + " use this as the key with which to retrieve it. Example:<br>" + + "<pre class='language-python'>\n" + + "dep = ctx.attr.deps[0]\n" + + "p = dep[apple_common.XcodeVersionProperties]\n" + + "</pre>", + structField = true) + ProviderApi getXcodeVersionPropertiesConstructor(); @SkylarkCallable( name = "XcodeVersionConfig", doc = "The constructor/key for the <code>XcodeVersionConfig</code> provider.", - structField = true - ) - public ProviderApi getXcodeVersionConfigConstructor(); + structField = true) + ProviderApi getXcodeVersionConfigConstructor(); @SkylarkCallable( - // TODO(b/63899207): This currently does not match ObjcProvider.SKYLARK_NAME as it requires - // a migration of existing skylark rules. - name = "Objc", - doc = - "The constructor/key for the <code>Objc</code> provider.<p>" - + "If a target propagates the <code>Objc</code> provider, use this as the " - + "key with which to retrieve it. Example:<br>" - + "<pre class='language-python'>\n" - + "dep = ctx.attr.deps[0]\n" - + "p = dep[apple_common.Objc]\n" - + "</pre>", - structField = true - ) - public ProviderApi getObjcProviderConstructor(); + // TODO(b/63899207): This currently does not match ObjcProvider.SKYLARK_NAME as it requires + // a migration of existing skylark rules. + name = "Objc", + doc = + "The constructor/key for the <code>Objc</code> provider.<p>" + + "If a target propagates the <code>Objc</code> provider, use this as the " + + "key with which to retrieve it. Example:<br>" + + "<pre class='language-python'>\n" + + "dep = ctx.attr.deps[0]\n" + + "p = dep[apple_common.Objc]\n" + + "</pre>", + structField = true) + ProviderApi getObjcProviderConstructor(); @SkylarkCallable( - name = "AppleDynamicFramework", - doc = - "The constructor/key for the <code>AppleDynamicFramework</code> provider.<p>" - + "If a target propagates the <code>AppleDynamicFramework</code> provider, use this " - + "as the key with which to retrieve it. Example:<br>" - + "<pre class='language-python'>\n" - + "dep = ctx.attr.deps[0]\n" - + "p = dep[apple_common.AppleDynamicFramework]\n" - + "</pre>", - structField = true - ) - public ProviderApi getAppleDynamicFrameworkConstructor(); + name = "AppleDynamicFramework", + doc = + "The constructor/key for the <code>AppleDynamicFramework</code> provider.<p>" + + "If a target propagates the <code>AppleDynamicFramework</code> provider, use this " + + "as the key with which to retrieve it. Example:<br>" + + "<pre class='language-python'>\n" + + "dep = ctx.attr.deps[0]\n" + + "p = dep[apple_common.AppleDynamicFramework]\n" + + "</pre>", + structField = true) + ProviderApi getAppleDynamicFrameworkConstructor(); @SkylarkCallable( - name = "AppleDylibBinary", - doc = - "The constructor/key for the <code>AppleDylibBinary</code> provider.<p>" - + "If a target propagates the <code>AppleDylibBinary</code> provider, use this as the " - + "key with which to retrieve it. Example:<br>" - + "<pre class='language-python'>\n" - + "dep = ctx.attr.deps[0]\n" - + "p = dep[apple_common.AppleDylibBinary]\n" - + "</pre>", - structField = true - ) - public ProviderApi getAppleDylibBinaryConstructor(); + name = "AppleDylibBinary", + doc = + "The constructor/key for the <code>AppleDylibBinary</code> provider.<p>If a target" + + " propagates the <code>AppleDylibBinary</code> provider, use this as the key with" + + " which to retrieve it. Example:<br><pre class='language-python'>\n" + + "dep = ctx.attr.deps[0]\n" + + "p = dep[apple_common.AppleDylibBinary]\n" + + "</pre>", + structField = true) + ProviderApi getAppleDylibBinaryConstructor(); @SkylarkCallable( - name = "AppleExecutableBinary", - doc = - "The constructor/key for the <code>AppleExecutableBinary</code> provider.<p>" - + "If a target propagates the <code>AppleExecutableBinary</code> provider," - + " use this as the key with which to retrieve it. Example:<br>" - + "<pre class='language-python'>\n" - + "dep = ctx.attr.deps[0]\n" - + "p = dep[apple_common.AppleExecutableBinary]\n" - + "</pre>", - structField = true - ) - public ProviderApi getAppleExecutableBinaryConstructor(); + name = "AppleExecutableBinary", + doc = + "The constructor/key for the <code>AppleExecutableBinary</code> provider.<p>" + + "If a target propagates the <code>AppleExecutableBinary</code> provider," + + " use this as the key with which to retrieve it. Example:<br>" + + "<pre class='language-python'>\n" + + "dep = ctx.attr.deps[0]\n" + + "p = dep[apple_common.AppleExecutableBinary]\n" + + "</pre>", + structField = true) + ProviderApi getAppleExecutableBinaryConstructor(); @SkylarkCallable( - name = "AppleStaticLibrary", - doc = - "The constructor/key for the <code>AppleStaticLibrary</code> provider.<p>" - + "If a target propagates the <code>AppleStaticLibrary</code> provider, use " - + "this as the key with which to retrieve it. Example:<br>" - + "<pre class='language-python'>\n" - + "dep = ctx.attr.deps[0]\n" - + "p = dep[apple_common.AppleStaticLibrary]\n" - + "</pre>", - structField = true - ) - public AppleStaticLibraryInfoProvider<?, ?> getAppleStaticLibraryProvider(); + name = "AppleStaticLibrary", + doc = + "The constructor/key for the <code>AppleStaticLibrary</code> provider.<p>" + + "If a target propagates the <code>AppleStaticLibrary</code> provider, use " + + "this as the key with which to retrieve it. Example:<br>" + + "<pre class='language-python'>\n" + + "dep = ctx.attr.deps[0]\n" + + "p = dep[apple_common.AppleStaticLibrary]\n" + + "</pre>", + structField = true) + AppleStaticLibraryInfoProvider<?, ?> getAppleStaticLibraryProvider(); @SkylarkCallable( - name = "AppleDebugOutputs", - doc = - "The constructor/key for the <code>AppleDebugOutputs</code> provider.<p>" - + "If a target propagates the <code>AppleDebugOutputs</code> provider, use this as the " - + "key with which to retrieve it. Example:<br>" - + "<pre class='language-python'>\n" - + "dep = ctx.attr.deps[0]\n" - + "p = dep[apple_common.AppleDebugOutputs]\n" - + "</pre>", - structField = true - ) - public ProviderApi getAppleDebugOutputsConstructor(); + name = "AppleDebugOutputs", + doc = + "The constructor/key for the <code>AppleDebugOutputs</code> provider.<p>If a target" + + " propagates the <code>AppleDebugOutputs</code> provider, use this as the key with" + + " which to retrieve it. Example:<br><pre class='language-python'>\n" + + "dep = ctx.attr.deps[0]\n" + + "p = dep[apple_common.AppleDebugOutputs]\n" + + "</pre>", + structField = true) + ProviderApi getAppleDebugOutputsConstructor(); @SkylarkCallable( - name = "AppleLoadableBundleBinary", - doc = - "The constructor/key for the <code>AppleLoadableBundleBinary</code> provider.<p>" - + "If a target propagates the <code>AppleLoadableBundleBinary</code> provider, " - + "use this as the key with which to retrieve it. Example:<br>" - + "<pre class='language-python'>\n" - + "dep = ctx.attr.deps[0]\n" - + "p = dep[apple_common.AppleLoadableBundleBinary]\n" - + "</pre>", - structField = true - ) - public ProviderApi getAppleLoadableBundleBinaryConstructor(); + name = "AppleLoadableBundleBinary", + doc = + "The constructor/key for the <code>AppleLoadableBundleBinary</code> provider.<p>" + + "If a target propagates the <code>AppleLoadableBundleBinary</code> provider, " + + "use this as the key with which to retrieve it. Example:<br>" + + "<pre class='language-python'>\n" + + "dep = ctx.attr.deps[0]\n" + + "p = dep[apple_common.AppleLoadableBundleBinary]\n" + + "</pre>", + structField = true) + ProviderApi getAppleLoadableBundleBinaryConstructor(); @SkylarkCallable( name = "apple_host_system_env", @@ -225,7 +205,7 @@ type = XcodeConfigInfoApi.class, doc = "A provider containing information about the xcode configuration."), }) - public ImmutableMap<String, String> getAppleHostSystemEnv(XcodeConfigInfoApiT xcodeConfig); + ImmutableMap<String, String> getAppleHostSystemEnv(XcodeConfigInfoApiT xcodeConfig); @SkylarkCallable( name = "target_apple_env", @@ -248,31 +228,29 @@ type = ApplePlatformApi.class, doc = "The apple platform."), }) - public ImmutableMap<String, String> getTargetAppleEnvironment( + ImmutableMap<String, String> getTargetAppleEnvironment( XcodeConfigInfoApiT xcodeConfig, ApplePlatformApiT platform); @SkylarkCallable( name = "multi_arch_split", - doc = "A configuration transition for rule attributes to build dependencies in one or" - + " more Apple platforms. " - + "<p>Use of this transition requires that the 'platform_type' and 'minimum_os_version'" - + " string attributes are defined and mandatory on the rule.</p>" - + "<p>The value of the platform_type attribute will dictate the target architectures " - + " for which dependencies along this configuration transition will be built.</p>" - + "<p>Options are:</p>" - + "<ul>" - + "<li><code>ios</code>: architectures gathered from <code>--ios_multi_cpus</code>.</li>" - + "<li><code>macos</code>: architectures gathered from <code>--macos_cpus</code>.</li>" - + "<li><code>tvos</code>: architectures gathered from <code>--tvos_cpus</code>.</li>" - + "<li><code>watchos</code>: architectures gathered from <code>--watchos_cpus</code>." - + "</li></ul>" - + "<p>minimum_os_version should be a dotted version string such as '7.3', and is used to" - + " set the minimum operating system on the configuration similarly based on platform" - + " type. For example, specifying platform_type 'ios' and minimum_os_version '8.0' will" - + " ensure that dependencies are built with minimum iOS version '8.0'.", - structField = true - ) - public SplitTransitionProviderApi getMultiArchSplitProvider(); + doc = + "A configuration transition for rule attributes to build dependencies in one or more" + + " Apple platforms. <p>Use of this transition requires that the 'platform_type' and" + + " 'minimum_os_version' string attributes are defined and mandatory on the" + + " rule.</p><p>The value of the platform_type attribute will dictate the target" + + " architectures for which dependencies along this configuration transition will" + + " be built.</p><p>Options are:</p><ul><li><code>ios</code>: architectures gathered" + + " from <code>--ios_multi_cpus</code>.</li><li><code>macos</code>: architectures" + + " gathered from <code>--macos_cpus</code>.</li><li><code>tvos</code>:" + + " architectures gathered from" + + " <code>--tvos_cpus</code>.</li><li><code>watchos</code>: architectures gathered" + + " from <code>--watchos_cpus</code>.</li></ul><p>minimum_os_version should be a" + + " dotted version string such as '7.3', and is used to set the minimum operating" + + " system on the configuration similarly based on platform type. For example," + + " specifying platform_type 'ios' and minimum_os_version '8.0' will ensure that" + + " dependencies are built with minimum iOS version '8.0'.", + structField = true) + SplitTransitionProviderApi getMultiArchSplitProvider(); @SkylarkCallable( name = "new_objc_provider", @@ -294,8 +272,8 @@ doc = "Dictionary of arguments."), useStarlarkThread = true) // This method is registered statically for skylark, and never called directly. - public ObjcProviderApi<?> newObjcProvider( - Boolean usesSwift, Dict<?, ?> kwargs, StarlarkThread thread) throws EvalException; + ObjcProviderApi<?> newObjcProvider(Boolean usesSwift, Dict<?, ?> kwargs, StarlarkThread thread) + throws EvalException; @SkylarkCallable( name = "new_dynamic_framework_provider", @@ -340,7 +318,7 @@ "The full set of artifacts that should be included as inputs to link against the " + "dynamic framework") }) - public AppleDynamicFrameworkInfoApi<?> newDynamicFrameworkProvider( + AppleDynamicFrameworkInfoApi<?> newDynamicFrameworkProvider( Object dylibBinary, ObjcProviderApiT depsObjcProvider, Object dynamicFrameworkDirs, @@ -382,7 +360,7 @@ }, useStarlarkThread = true) // TODO(b/70937317): Iterate on, improve, and solidify this API. - public StructApi linkMultiArchBinary( + StructApi linkMultiArchBinary( SkylarkRuleContextApi skylarkRuleContext, Sequence<?> extraLinkopts, // <String> expected. Sequence<?> extraLinkInputs, // <? extends FileApi> expected. @@ -398,14 +376,13 @@ type = String.class, doc = "The string representation of the DottedVersion.") }) - public DottedVersionApi<?> dottedVersion(String version) throws EvalException; + DottedVersionApi<?> dottedVersion(String version) throws EvalException; @SkylarkCallable( - name = "objc_proto_aspect", - doc = - "objc_proto_aspect gathers the proto dependencies of the attached rule target," - + "and propagates the proto values of its dependencies through the ObjcProto provider.", - structField = true - ) - public SkylarkAspectApi getObjcProtoAspect(); + name = "objc_proto_aspect", + doc = + "objc_proto_aspect gathers the proto dependencies of the attached rule target,and" + + " propagates the proto values of its dependencies through the ObjcProto provider.", + structField = true) + SkylarkAspectApi getObjcProtoAspect(); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleConfigurationApi.java index 4462bf1..8b39487 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleConfigurationApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleConfigurationApi.java
@@ -35,58 +35,56 @@ "<b>Deprecated. Use <a href='#single_arch_cpu'>single_arch_cpu</a> instead.</b> " + "The value of ios_cpu for this configuration.") @StarlarkDeprecated - public String getIosCpu(); + String getIosCpu(); @SkylarkCallable( - name = "single_arch_cpu", - structField = true, - doc = - "The single \"effective\" architecture for this configuration (e.g., <code>i386</code> or " - + "<code>arm64</code>) in the context of rule logic that is only concerned with a " - + "single architecture (such as <code>objc_library</code>, which registers " - + "single-architecture compile actions)." - ) - public String getSingleArchitecture(); + name = "single_arch_cpu", + structField = true, + doc = + "The single \"effective\" architecture for this configuration (e.g., <code>i386</code>" + + " or <code>arm64</code>) in the context of rule logic that is only concerned with" + + " a single architecture (such as <code>objc_library</code>, which registers" + + " single-architecture compile actions).") + String getSingleArchitecture(); @SkylarkCallable( - name = "single_arch_platform", - doc = "The platform of the current configuration. This should only be invoked in a context " - + "where only a single architecture may be supported; consider " - + "<a href='#multi_arch_platform'>multi_arch_platform</a> for other cases.", - structField = true - ) - public ApplePlatformApi getSingleArchPlatform(); + name = "single_arch_platform", + doc = + "The platform of the current configuration. This should only be invoked in a context " + + "where only a single architecture may be supported; consider " + + "<a href='#multi_arch_platform'>multi_arch_platform</a> for other cases.", + structField = true) + ApplePlatformApi getSingleArchPlatform(); @SkylarkCallable( - name = "multi_arch_platform", - doc = "The platform of the current configuration for the given platform type. This should only " - + "be invoked in a context where multiple architectures may be supported; consider " - + "<a href='#single_arch_platform'>single_arch_platform</a> for other cases.", - parameters = { - @Param( - name = "platform_type", - positional = true, - named = false, - type = ApplePlatformTypeApi.class, - doc = "The apple platform type." - ) - } - ) - public ApplePlatformApi getMultiArchPlatform(ApplePlatformTypeApiT platformType); + name = "multi_arch_platform", + doc = + "The platform of the current configuration for the given platform type. This should only " + + "be invoked in a context where multiple architectures may be supported; consider " + + "<a href='#single_arch_platform'>single_arch_platform</a> for other cases.", + parameters = { + @Param( + name = "platform_type", + positional = true, + named = false, + type = ApplePlatformTypeApi.class, + doc = "The apple platform type.") + }) + ApplePlatformApi getMultiArchPlatform(ApplePlatformTypeApiT platformType); @SkylarkCallable( name = "ios_cpu_platform", - doc = "<b>Deprecated. Use <a href='#single_arch_platform'>single_arch_platform</a> or " - + "<a href='#multi_arch_platform'>multi_arch_platform</a> instead.</b> " - + "The platform given by the ios_cpu flag.") - public ApplePlatformApi getIosCpuPlatform(); + doc = + "<b>Deprecated. Use <a href='#single_arch_platform'>single_arch_platform</a> or " + + "<a href='#multi_arch_platform'>multi_arch_platform</a> instead.</b> " + + "The platform given by the ios_cpu flag.") + ApplePlatformApi getIosCpuPlatform(); @SkylarkCallable( - name = "bitcode_mode", - doc = "Returns the Bitcode mode to use for compilation steps.<p>" - + "This field is only valid for device builds; for simulator builds, it always returns " - + "<code>'none'</code>.", - structField = true - ) - public AppleBitcodeModeApi getBitcodeMode(); + name = "bitcode_mode", + doc = + "Returns the Bitcode mode to use for compilation steps.<p>This field is only valid for" + + " device builds; for simulator builds, it always returns <code>'none'</code>.", + structField = true) + AppleBitcodeModeApi getBitcodeMode(); }
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 ed1c85c..ccf6765 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
@@ -31,12 +31,13 @@ ) public interface AppleDebugOutputsApi<FileT extends FileApi> extends StructApi { - @SkylarkCallable(name = "outputs_map", + @SkylarkCallable( + name = "outputs_map", structField = true, - doc = "A dictionary of: { arch: { output_type: file, output_type: file, ... } }, " - + "where 'arch' is any Apple architecture such as 'arm64' or 'armv7', 'output_type' is " - + "a string descriptor such as 'bitcode_symbols' or 'dsym_binary', and the file is the " - + "file matching that descriptor for that architecture." - ) - public ImmutableMap<String, ImmutableMap<String, FileT>> getOutputsMap(); + doc = + "A dictionary of: { arch: { output_type: file, output_type: file, ... } }, where 'arch'" + + " is any Apple architecture such as 'arm64' or 'armv7', 'output_type' is a string" + + " descriptor such as 'bitcode_symbols' or 'dsym_binary', and the file is the file" + + " matching that descriptor for that architecture.") + ImmutableMap<String, ImmutableMap<String, FileT>> getOutputsMap(); }
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 3d59386..0c73a2c 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
@@ -32,17 +32,18 @@ ) public interface AppleDylibBinaryApi extends StructApi { - @SkylarkCallable(name = "binary", + @SkylarkCallable( + name = "binary", structField = true, - doc = "The dylib file output by apple_binary." - ) - public FileApi getAppleDylibBinary(); + doc = "The dylib file output by apple_binary.") + FileApi getAppleDylibBinary(); - @SkylarkCallable(name = "objc", + @SkylarkCallable( + name = "objc", structField = true, - doc = "A provider which contains information about the transitive dependencies linked into " - + "the dylib, (intended so that binaries depending on this dylib may avoid relinking " - + "symbols included in the dylib." - ) - public ObjcProviderApi<?> getDepsObjcProvider(); + doc = + "A provider which contains information about the transitive dependencies linked into " + + "the dylib, (intended so that binaries depending on this dylib may avoid relinking " + + "symbols included in the dylib.") + ObjcProviderApi<?> getDepsObjcProvider(); }
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 9b5efca..8168fc8 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
@@ -41,7 +41,7 @@ doc = "The framework path names used as link inputs in order to link against the dynamic " + "framework.") - public Depset /*<String>*/ getDynamicFrameworkDirs(); + Depset /*<String>*/ getDynamicFrameworkDirs(); /** * Returns the full set of artifacts that should be included as inputs to link against the dynamic @@ -53,29 +53,31 @@ doc = "The full set of files that should be included as inputs to link against the " + "dynamic framework.") - public Depset /*<FileApiT>*/ getDynamicFrameworkFiles(); + Depset /*<FileApiT>*/ getDynamicFrameworkFiles(); /** - * Returns the multi-architecture dylib binary of the dynamic framework. May return null if - * the rule providing the framework only specified framework imports. + * Returns the multi-architecture dylib binary of the dynamic framework. May return null if the + * rule providing the framework only specified framework imports. */ @Nullable - @SkylarkCallable(name = "binary", + @SkylarkCallable( + name = "binary", allowReturnNones = true, structField = true, - doc = "The multi-architecture dylib binary of the dynamic framework. May be None if " - + "the rule providing the framework only specified framework imports." - ) - public FileApi getAppleDylibBinary(); + doc = + "The multi-architecture dylib binary of the dynamic framework. May be None if " + + "the rule providing the framework only specified framework imports.") + FileApi getAppleDylibBinary(); /** * Returns the {@link ObjcProviderApi} which contains information about the transitive * dependencies linked into the dylib. */ - @SkylarkCallable(name = "objc", + @SkylarkCallable( + name = "objc", structField = true, - doc = "A provider which contains information about the transitive dependencies linked into " - + "the dynamic framework." - ) - public ObjcProviderApi<FileApiT> getDepsObjcProvider(); + doc = + "A provider which contains information about the transitive dependencies linked into " + + "the dynamic framework.") + ObjcProviderApi<FileApiT> getDepsObjcProvider(); }
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 427f022..c471e85 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
@@ -32,16 +32,17 @@ ) public interface AppleExecutableBinaryApi extends StructApi { - @SkylarkCallable(name = "binary", + @SkylarkCallable( + name = "binary", structField = true, - doc = "The executable binary file output by apple_binary." - ) - public FileApi getAppleExecutableBinary(); + doc = "The executable binary file output by apple_binary.") + FileApi getAppleExecutableBinary(); - @SkylarkCallable(name = "objc", + @SkylarkCallable( + name = "objc", structField = true, - doc = "A provider which contains information about the transitive dependencies linked into " - + "the binary." - ) - public ObjcProviderApi<?> getDepsObjcProvider(); + doc = + "A provider which contains information about the transitive dependencies linked into " + + "the binary.") + ObjcProviderApi<?> getDepsObjcProvider(); }
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 d07e499..e846f76 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
@@ -32,16 +32,17 @@ ) public interface AppleLoadableBundleBinaryApi extends StructApi { - @SkylarkCallable(name = "binary", + @SkylarkCallable( + name = "binary", structField = true, - doc = "The binary file output by apple_binary." - ) - public FileApi getAppleLoadableBundleBinary(); + doc = "The binary file output by apple_binary.") + FileApi getAppleLoadableBundleBinary(); - @SkylarkCallable(name = "objc", + @SkylarkCallable( + name = "objc", structField = true, - doc = "A provider which contains information about the transitive dependencies linked into " - + "the binary." - ) - public ObjcProviderApi<?> getDepsObjcProvider(); + doc = + "A provider which contains information about the transitive dependencies linked into " + + "the binary.") + ObjcProviderApi<?> getDepsObjcProvider(); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ApplePlatformApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ApplePlatformApi.java index b70c9f3..24c11c8 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ApplePlatformApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ApplePlatformApi.java
@@ -50,31 +50,34 @@ @SkylarkCallable( name = "platform_type", doc = "Returns the platform type of this platform.", - structField = true - ) - public ApplePlatformTypeApi getType(); + structField = true) + ApplePlatformTypeApi getType(); /** * Returns true if this platform is a device platform, or false if this is a simulator platform. */ @SkylarkCallable( name = "is_device", - doc = "Returns <code>True</code> if this platform is a device platform or <code>False</code> " - + "if it is a simulator platform.", - structField = true - ) - public boolean isDevice(); + doc = + "Returns <code>True</code> if this platform is a device platform or <code>False</code> " + + "if it is a simulator platform.", + structField = true) + boolean isDevice(); /** * Returns the name of the "platform" as it appears in the CFBundleSupportedPlatforms plist * setting. */ - @SkylarkCallable(name = "name_in_plist", structField = true, - doc = "The name of the platform as it appears in the <code>CFBundleSupportedPlatforms</code> " - + "entry of an Info.plist file and in Xcode's platforms directory, without the extension " - + "(for example, <code>iPhoneOS</code> or <code>iPhoneSimulator</code>).<br>" - + "This name, when converted to lowercase (e.g., <code>iphoneos</code>, " - + "<code>iphonesimulator</code>), can be passed to Xcode's command-line tools like " - + "<code>ibtool</code> and <code>actool</code> when they expect a platform name.") - public String getNameInPlist(); + @SkylarkCallable( + name = "name_in_plist", + structField = true, + doc = + "The name of the platform as it appears in the <code>CFBundleSupportedPlatforms</code>" + + " entry of an Info.plist file and in Xcode's platforms directory, without the" + + " extension (for example, <code>iPhoneOS</code> or" + + " <code>iPhoneSimulator</code>).<br>This name, when converted to lowercase (e.g.," + + " <code>iphoneos</code>, <code>iphonesimulator</code>), can be passed to Xcode's" + + " command-line tools like <code>ibtool</code> and <code>actool</code> when they" + + " expect a platform name.") + String getNameInPlist(); }
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 080d44a..46ada68 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
@@ -37,48 +37,49 @@ public interface AppleStaticLibraryInfoApi extends StructApi { /** Skylark name for this interface. */ - public static final String SKYLARK_NAME = "AppleStaticLibrary"; + String SKYLARK_NAME = "AppleStaticLibrary"; - @SkylarkCallable(name = "archive", + @SkylarkCallable( + name = "archive", structField = true, - doc = "The multi-arch archive (.a) output by apple_static_library." - ) - public FileApi getMultiArchArchive(); + doc = "The multi-arch archive (.a) output by apple_static_library.") + FileApi getMultiArchArchive(); - @SkylarkCallable(name = "objc", + @SkylarkCallable( + name = "objc", structField = true, - doc = "A provider which contains information about the transitive dependencies linked into " - + "the archive." - ) - public ObjcProviderApi<?> getDepsObjcProvider(); + doc = + "A provider which contains information about the transitive dependencies linked into " + + "the archive.") + ObjcProviderApi<?> getDepsObjcProvider(); - /** - * Interface for the provider type for {@link AppleStaticLibraryInfoApi}. - */ - public interface AppleStaticLibraryInfoProvider<FileApiT extends FileApi, - ObjcProviderApiT extends ObjcProviderApi<?>> extends ProviderApi { + /** Interface for the provider type for {@link AppleStaticLibraryInfoApi}. */ + interface AppleStaticLibraryInfoProvider< + FileApiT extends FileApi, ObjcProviderApiT extends ObjcProviderApi<?>> + extends ProviderApi { @SkylarkCallable( name = SKYLARK_NAME, doc = "The <code>AppleStaticLibrary</code> constructor.", parameters = { - @Param( - name = "archive", - type = FileApi.class, - named = true, - positional = false, - doc = "Multi-architecture archive (.a) representing a static library"), - @Param( - name = "objc", - type = ObjcProviderApi.class, - named = true, - positional = false, - doc = "A provider which contains information about the transitive dependencies " - + "linked into the archive."), + @Param( + name = "archive", + type = FileApi.class, + named = true, + positional = false, + doc = "Multi-architecture archive (.a) representing a static library"), + @Param( + name = "objc", + type = ObjcProviderApi.class, + named = true, + positional = false, + doc = + "A provider which contains information about the transitive dependencies " + + "linked into the archive."), }, selfCall = true) @SkylarkConstructor(objectType = AppleStaticLibraryInfoApi.class) - public AppleStaticLibraryInfoApi appleStaticLibrary( - FileApiT archive, ObjcProviderApiT objcProvider) throws EvalException; + AppleStaticLibraryInfoApi appleStaticLibrary(FileApiT archive, ObjcProviderApiT objcProvider) + throws EvalException; } }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleToolchainApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleToolchainApi.java index 740724b..e968d60 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleToolchainApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleToolchainApi.java
@@ -27,29 +27,25 @@ extends StarlarkValue { @SkylarkCallable( - name = "sdk_dir", - doc = "Returns the platform directory inside of Xcode for a given configuration." - ) - public String sdkDirConstant(); + name = "sdk_dir", + doc = "Returns the platform directory inside of Xcode for a given configuration.") + String sdkDirConstant(); @SkylarkCallable( - name = "developer_dir", - doc = "Returns the Developer directory inside of Xcode for a given configuration." - ) - public String developerDirConstant(); + name = "developer_dir", + doc = "Returns the Developer directory inside of Xcode for a given configuration.") + String developerDirConstant(); @SkylarkCallable( - name = "platform_developer_framework_dir", - doc = "Returns the platform frameworks directory inside of Xcode for a given configuration.", - parameters = { - @Param( - name = "configuration", - positional = true, - named = false, - type = AppleConfigurationApi.class, - doc = "The apple configuration fragment." - ) - } - ) - public String platformFrameworkDirFromConfig(AppleConfigurationApiT configuration); + name = "platform_developer_framework_dir", + doc = "Returns the platform frameworks directory inside of Xcode for a given configuration.", + parameters = { + @Param( + name = "configuration", + positional = true, + named = false, + type = AppleConfigurationApi.class, + doc = "The apple configuration fragment.") + }) + String platformFrameworkDirFromConfig(AppleConfigurationApiT configuration); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/DottedVersionApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/DottedVersionApi.java index b86e696..cbbd691 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/DottedVersionApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/DottedVersionApi.java
@@ -44,9 +44,7 @@ positional = true, named = false, type = DottedVersionApi.class, - doc = "The other dotted version." - ) - } - ) - public int compareTo_skylark(SelfT other); + doc = "The other dotted version.") + }) + int compareTo_skylark(SelfT other); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/J2ObjcConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/J2ObjcConfigurationApi.java index 3fbb9b3..3b1215e 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/J2ObjcConfigurationApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/J2ObjcConfigurationApi.java
@@ -30,7 +30,6 @@ @SkylarkCallable( name = "translation_flags", structField = true, - doc = "The list of flags to be used when the j2objc compiler is invoked. " - ) - public ImmutableList<String> getTranslationFlags(); + doc = "The list of flags to be used when the j2objc compiler is invoked. ") + ImmutableList<String> getTranslationFlags(); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ObjcConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ObjcConfigurationApi.java index 764146b..1676b34 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ObjcConfigurationApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ObjcConfigurationApi.java
@@ -35,14 +35,14 @@ structField = true, allowReturnNones = true, doc = "The type of device (e.g. 'iPhone 6') to use when running on the simulator.") - public String getIosSimulatorDevice(); + String getIosSimulatorDevice(); @SkylarkCallable( name = "ios_simulator_version", structField = true, allowReturnNones = true, doc = "The SDK version of the iOS simulator to use when running on the simulator.") - public DottedVersionApi<?> getIosSimulatorVersion(); + DottedVersionApi<?> getIosSimulatorVersion(); @SkylarkCallable( name = "simulator_device_for_platform_type", @@ -56,7 +56,7 @@ type = ApplePlatformTypeApi.class, doc = "The apple platform type."), }) - public String getSimulatorDeviceForPlatformType(ApplePlatformTypeApiT platformType); + String getSimulatorDeviceForPlatformType(ApplePlatformTypeApiT platformType); @SkylarkCallable( name = "simulator_version_for_platform_type", @@ -70,50 +70,64 @@ type = ApplePlatformTypeApi.class, doc = "The apple platform type."), }) - public DottedVersionApi<?> getSimulatorVersionForPlatformType(ApplePlatformTypeApiT platformType); + DottedVersionApi<?> getSimulatorVersionForPlatformType(ApplePlatformTypeApiT platformType); @SkylarkCallable( name = "generate_dsym", doc = "Whether to generate debug symbol(.dSYM) artifacts.", structField = true) - public boolean generateDsym(); + boolean generateDsym(); @SkylarkCallable( name = "generate_linkmap", doc = "Whether to generate linkmap artifacts.", structField = true) - public boolean generateLinkmap(); + boolean generateLinkmap(); @SkylarkCallable( - name = "run_memleaks", - structField = true, - doc = "Returns a boolean indicating whether memleaks should be run during tests or not." - ) - public boolean runMemleaks(); + name = "run_memleaks", + structField = true, + doc = "Returns a boolean indicating whether memleaks should be run during tests or not.") + boolean runMemleaks(); - @SkylarkCallable(name = "copts_for_current_compilation_mode", structField = true, - doc = "Returns a list of default options to use for compiling Objective-C in the current " - + "mode.") - public ImmutableList<String> getCoptsForCompilationMode(); + @SkylarkCallable( + name = "copts_for_current_compilation_mode", + structField = true, + doc = + "Returns a list of default options to use for compiling Objective-C in the current " + + "mode.") + ImmutableList<String> getCoptsForCompilationMode(); - @SkylarkCallable(name = "copts", structField = true, - doc = "Returns a list of options to use for compiling Objective-C." - + "These options are applied after any default options but before options specified in the " - + "attributes of the rule.") - public ImmutableList<String> getCopts(); + @SkylarkCallable( + name = "copts", + structField = true, + doc = + "Returns a list of options to use for compiling Objective-C.These options are applied" + + " after any default options but before options specified in the attributes of the" + + " rule.") + ImmutableList<String> getCopts(); - @SkylarkCallable(name = "signing_certificate_name", structField = true, allowReturnNones = true, - doc = "Returns the flag-supplied certificate name to be used in signing, or None if no such " - + "certificate was specified.") + @SkylarkCallable( + name = "signing_certificate_name", + structField = true, + allowReturnNones = true, + doc = + "Returns the flag-supplied certificate name to be used in signing, or None if no such " + + "certificate was specified.") @Nullable - public String getSigningCertName(); + String getSigningCertName(); - @SkylarkCallable(name = "uses_device_debug_entitlements", structField = true, - doc = "Returns whether device debug entitlements should be included when signing an " - + "application.") - public boolean useDeviceDebugEntitlements(); + @SkylarkCallable( + name = "uses_device_debug_entitlements", + structField = true, + doc = + "Returns whether device debug entitlements should be included when signing an " + + "application.") + boolean useDeviceDebugEntitlements(); - @SkylarkCallable(name = "enable_apple_binary_native_protos", structField = true, + @SkylarkCallable( + name = "enable_apple_binary_native_protos", + structField = true, doc = "Returns whether apple_binary should generate and link protos natively.") - public boolean enableAppleBinaryNativeProtos(); + boolean enableAppleBinaryNativeProtos(); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ObjcProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ObjcProviderApi.java index 435a480..58c0b0a 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ObjcProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/ObjcProviderApi.java
@@ -38,7 +38,7 @@ doc = "A set of strings from 'defines' attributes. These are to be passed as '-D' flags to " + "all invocations of the compiler for this target and all depending targets.") - public Depset /*<String>*/ defineForStarlark(); + Depset /*<String>*/ defineForStarlark(); @SkylarkCallable( name = "dynamic_framework_file", @@ -46,13 +46,13 @@ doc = "The library files in .framework directories belonging to a dynamically linked " + "framework.") - public Depset /*<FileApiT>*/ dynamicFrameworkFileForStarlark(); + Depset /*<FileApiT>*/ dynamicFrameworkFileForStarlark(); @SkylarkCallable( name = "exported_debug_artifacts", structField = true, doc = "Debug files that should be exported by the top-level target.") - public Depset /*<FileApiT>*/ exportedDebugArtifacts(); + Depset /*<FileApiT>*/ exportedDebugArtifacts(); @SkylarkCallable( name = "framework_search_path_only", @@ -60,19 +60,19 @@ doc = "Exec paths of .framework directories corresponding to frameworks to include " + "in search paths, but not to link.") - public Depset /*<String>*/ frameworkSearchPathOnly(); + Depset /*<String>*/ frameworkSearchPathOnly(); @SkylarkCallable( name = "force_load_library", structField = true, doc = "Libraries to load with -force_load.") - public Depset /*<FileApiT>*/ forceLoadLibrary(); + Depset /*<FileApiT>*/ forceLoadLibrary(); @SkylarkCallable( name = "header", structField = true, doc = "All header files. These may be either public or private headers.") - public Depset /*<FileApiT>*/ headerForStarlark(); + Depset /*<FileApiT>*/ headerForStarlark(); @SkylarkCallable( name = "direct_headers", @@ -80,13 +80,13 @@ doc = "Header files from this target directly (no transitive headers). " + "These may be either public or private headers.") - public Sequence<FileApiT> directHeaders(); + Sequence<FileApiT> directHeaders(); @SkylarkCallable( name = "imported_library", structField = true, doc = "Imported precompiled static libraries (.a files) to be linked into the binary.") - public Depset /*<FileApiT>*/ importedLibrary(); + Depset /*<FileApiT>*/ importedLibrary(); @SkylarkCallable( name = "include", @@ -94,37 +94,37 @@ doc = "Include search paths specified with '-I' on the command line. Also known as " + "header search paths (and distinct from <em>user</em> header search paths).") - public Depset include(); + Depset include(); @SkylarkCallable( name = "include_system", structField = true, doc = "System include search paths (typically specified with -isystem).") - public Depset includeSystem(); + Depset includeSystem(); @SkylarkCallable( name = "iquote", structField = true, doc = "User header search paths (typically specified with -iquote).") - public Depset iquote(); + Depset iquote(); @SkylarkCallable( name = "j2objc_library", structField = true, doc = "Static libraries that are built from J2ObjC-translated Java code.") - public Depset /*<FileApiT>*/ j2objcLibrary(); + Depset /*<FileApiT>*/ j2objcLibrary(); @SkylarkCallable( name = "jre_library", structField = true, doc = "J2ObjC JRE emulation libraries and their dependencies.") - public Depset /*<FileApiT>*/ jreLibrary(); + Depset /*<FileApiT>*/ jreLibrary(); @SkylarkCallable( name = "library", structField = true, doc = "Library (.a) files compiled by dependencies of the current target.") - public Depset /*<FileApiT>*/ library(); + Depset /*<FileApiT>*/ library(); @SkylarkCallable( name = "link_inputs", @@ -134,7 +134,7 @@ + " libraries or archives. This catch-all provides a way to add arbitrary data (e.g." + " Swift AST files) to the linker. The rule that adds these is also responsible to" + " add the necessary linker flags to 'linkopt'.") - public Depset /*<FileApiT>*/ linkInputs(); + Depset /*<FileApiT>*/ linkInputs(); @SkylarkCallable( name = "linked_binary", @@ -142,16 +142,16 @@ doc = "Single-architecture linked binaries to be combined for the final multi-architecture " + "binary.") - public Depset /*<FileApiT>*/ linkedBinary(); + Depset /*<FileApiT>*/ linkedBinary(); @SkylarkCallable( name = "linkmap_file", structField = true, doc = "Single-architecture link map for a binary.") - public Depset /*<FileApiT>*/ linkmapFile(); + Depset /*<FileApiT>*/ linkmapFile(); @SkylarkCallable(name = "linkopt", structField = true, doc = "Linking options.") - public Depset /*<String>*/ linkopt(); + Depset /*<String>*/ linkopt(); @SkylarkCallable( name = "merge_zip", @@ -160,13 +160,13 @@ "Merge zips to include in the bundle. The entries of these zip files are included " + "in the final bundle with the same path. The entries in the merge zips should not " + "include the bundle root path (e.g. 'Foo.app').") - public Depset /*<FileApiT>*/ mergeZip(); + Depset /*<FileApiT>*/ mergeZip(); @SkylarkCallable( name = "module_map", structField = true, doc = "Clang module maps, used to enforce proper use of private header files.") - public Depset /*<FileApiT>*/ moduleMap(); + Depset /*<FileApiT>*/ moduleMap(); @SkylarkCallable( name = "direct_module_maps", @@ -174,52 +174,52 @@ doc = "Module map files from this target directly (no transitive module maps). " + "Used to enforce proper use of private header files and for Swift compilation.") - public Sequence<FileApiT> directModuleMaps(); + Sequence<FileApiT> directModuleMaps(); @SkylarkCallable( name = "multi_arch_dynamic_libraries", structField = true, doc = "Combined-architecture dynamic libraries to include in the final bundle.") - public Depset /*<FileApiT>*/ multiArchDynamicLibraries(); + Depset /*<FileApiT>*/ multiArchDynamicLibraries(); @SkylarkCallable( name = "multi_arch_linked_archives", structField = true, doc = "Combined-architecture archives to include in the final bundle.") - public Depset /*<FileApiT>*/ multiArchLinkedArchives(); + Depset /*<FileApiT>*/ multiArchLinkedArchives(); @SkylarkCallable( name = "multi_arch_linked_binaries", structField = true, doc = "Combined-architecture binaries to include in the final bundle.") - public Depset /*<FileApiT>*/ multiArchLinkedBinaries(); + Depset /*<FileApiT>*/ multiArchLinkedBinaries(); @SkylarkCallable( name = "sdk_dylib", structField = true, doc = "Names of SDK .dylib libraries to link with. For instance, 'libz' or 'libarchive'.") - public Depset /*<String>*/ sdkDylib(); + Depset /*<String>*/ sdkDylib(); @SkylarkCallable( name = "sdk_framework", structField = true, doc = "Names of SDK frameworks to link with (e.g. 'AddressBook', 'QuartzCore').") - public Depset sdkFramework(); + Depset sdkFramework(); @SkylarkCallable(name = "source", structField = true, doc = "All transitive source files.") - public Depset /*<FileApiT>*/ sourceForStarlark(); + Depset /*<FileApiT>*/ sourceForStarlark(); @SkylarkCallable( name = "direct_sources", structField = true, doc = "All direct source files from this target (no transitive files).") - public Sequence<FileApiT> directSources(); + Sequence<FileApiT> directSources(); @SkylarkCallable( name = "static_framework_file", structField = true, doc = "The library files in .framework directories that should be statically linked.") - public Depset /*<FileApiT>*/ staticFrameworkFileForStarlark(); + Depset /*<FileApiT>*/ staticFrameworkFileForStarlark(); @SkylarkCallable( name = "umbrella_header", @@ -227,7 +227,7 @@ doc = "Clang umbrella header. Public headers are #included in umbrella headers to be " + "compatible with J2ObjC segmented headers.") - public Depset /*<FileApiT>*/ umbrellaHeader(); + Depset /*<FileApiT>*/ umbrellaHeader(); @SkylarkCallable( name = "weak_sdk_framework", @@ -236,29 +236,29 @@ "Names of SDK frameworks to weakly link with. For instance, 'MediaAccessibility'. " + "In difference to regularly linked SDK frameworks, symbols from weakly linked " + "frameworks do not cause an error if they are not present at runtime.") - public Depset weakSdkFramework(); + Depset weakSdkFramework(); @SkylarkCallable( name = "dynamic_framework_names", structField = true, doc = "Returns all names of dynamic frameworks in this provider.") - public Depset /*<String>*/ dynamicFrameworkNamesForStarlark(); + Depset /*<String>*/ dynamicFrameworkNamesForStarlark(); @SkylarkCallable( name = "dynamic_framework_paths", structField = true, doc = "Returns all framework paths to dynamic frameworks in this provider.") - public Depset /*<String>*/ dynamicFrameworkPathsForStarlark(); + Depset /*<String>*/ dynamicFrameworkPathsForStarlark(); @SkylarkCallable( name = "static_framework_names", structField = true, doc = "Returns all names of static frameworks in this provider.") - public Depset /*<String>*/ staticFrameworkNamesForStarlark(); + Depset /*<String>*/ staticFrameworkNamesForStarlark(); @SkylarkCallable( name = "static_framework_paths", structField = true, doc = "Returns all framework paths to static frameworks in this provider.") - public Depset /*<String>*/ staticFrameworkPathsForStarlark(); + Depset /*<String>*/ staticFrameworkPathsForStarlark(); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/SwiftConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/SwiftConfigurationApi.java index 662e736..36ed222 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/SwiftConfigurationApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/SwiftConfigurationApi.java
@@ -28,8 +28,9 @@ public interface SwiftConfigurationApi extends StarlarkValue { @SkylarkCallable( - name = "copts", - doc = "A list of compiler options that should be passed to <code>swiftc</code> when compiling " - + "Swift code.") - public ImmutableList<String> getCopts(); + name = "copts", + doc = + "A list of compiler options that should be passed to <code>swiftc</code> when compiling " + + "Swift code.") + ImmutableList<String> getCopts(); }
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 57f5b11..def2617 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
@@ -42,7 +42,7 @@ "Returns the Xcode version that is being used to build.<p>" + "This will return <code>None</code> if no Xcode versions are available.", allowReturnNones = true) - public DottedVersionApi<?> getXcodeVersion(); + DottedVersionApi<?> getXcodeVersion(); @SkylarkCallable( name = "minimum_os_for_platform_type", @@ -57,7 +57,7 @@ type = ApplePlatformTypeApi.class, doc = "The apple platform type."), }) - public DottedVersionApi<?> getMinimumOsForPlatformType(ApplePlatformTypeApiT platformType); + DottedVersionApi<?> getMinimumOsForPlatformType(ApplePlatformTypeApiT platformType); @SkylarkCallable( name = "sdk_version_for_platform", @@ -72,7 +72,7 @@ type = ApplePlatformApi.class, doc = "The apple platform."), }) - public DottedVersionApi<?> getSdkVersionForPlatform(ApplePlatformApiT platform); + DottedVersionApi<?> getSdkVersionForPlatform(ApplePlatformApiT platform); /** An interface for the provider of {@link XcodeConfigInfoApi}. */ @SkylarkModule( @@ -80,7 +80,7 @@ category = SkylarkModuleCategory.PROVIDER, documented = false, doc = "") - public interface XcodeConfigProviderApi extends ProviderApi { + interface XcodeConfigProviderApi extends ProviderApi { @SkylarkCallable( name = "XcodeVersionConfig", @@ -136,7 +136,7 @@ @SkylarkConstructor( objectType = XcodeConfigInfoApi.class, receiverNameForDoc = "XcodeConfigInfo") - public XcodeConfigInfoApi<?, ?> xcodeConfigInfo( + XcodeConfigInfoApi<?, ?> xcodeConfigInfo( String iosSdkVersion, String iosMinimumOsVersion, String watchosSdkVersion,
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 d4a6bad..b33abdc 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
@@ -34,48 +34,47 @@ name = "xcode_version", doc = "The xcode version, or <code>None</code> if the xcode version is unknown.", structField = true, - allowReturnNones = true - ) + allowReturnNones = true) @Nullable - public String getXcodeVersionString(); + String getXcodeVersionString(); @SkylarkCallable( name = "default_ios_sdk_version", - doc = "The default iOS sdk version for this version of xcode, or <code>None</code> if " - + "unknown.", + doc = + "The default iOS sdk version for this version of xcode, or <code>None</code> if " + + "unknown.", structField = true, - allowReturnNones = true - ) + allowReturnNones = true) @Nullable - public String getDefaultIosSdkVersionString(); + String getDefaultIosSdkVersionString(); @SkylarkCallable( name = "default_watchos_sdk_version", - doc = "The default watchOS sdk version for this version of xcode, or <code>None</code> if " - + "unknown.", + doc = + "The default watchOS sdk version for this version of xcode, or <code>None</code> if " + + "unknown.", structField = true, - allowReturnNones = true - ) + allowReturnNones = true) @Nullable - public String getDefaultWatchosSdkVersionString(); + String getDefaultWatchosSdkVersionString(); @SkylarkCallable( name = "default_tvos_sdk_version", - doc = "The default tvOS sdk version for this version of xcode, or <code>None</code> if " - + "unknown.", + doc = + "The default tvOS sdk version for this version of xcode, or <code>None</code> if " + + "unknown.", structField = true, - allowReturnNones = true - ) + allowReturnNones = true) @Nullable - public String getDefaultTvosSdkVersionString(); + String getDefaultTvosSdkVersionString(); @SkylarkCallable( name = "default_macos_sdk_version", - doc = "The default macOS sdk version for this version of xcode, or <code>None</code> if " - + "unknown.", + doc = + "The default macOS sdk version for this version of xcode, or <code>None</code> if " + + "unknown.", structField = true, - allowReturnNones = true - ) + allowReturnNones = true) @Nullable - public String getDefaultMacosSdkVersionString(); + String getDefaultMacosSdkVersionString(); }