1 files changed, 28 insertions, 48 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java
index d72a550377..5e8881adff 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java
@@ -403,13 +403,10 @@ public class AppleSkylarkCommon {
         }
       };
 
-  @SkylarkSignature(
+  @SkylarkCallable(
     name = "new_dynamic_framework_provider",
-    objectType = AppleSkylarkCommon.class,
-    returnType = AppleDynamicFrameworkInfo.class,
     doc = "Creates a new AppleDynamicFramework provider instance.",
     parameters = {
-      @Param(name = "self", type = AppleSkylarkCommon.class, doc = "The apple_common instance."),
       @Param(
         name = AppleDynamicFrameworkInfo.DYLIB_BINARY_FIELD_NAME,
         type = Artifact.class,
@@ -452,35 +449,29 @@ public class AppleSkylarkCommon {
       )
     }
   )
-  public static final BuiltinFunction NEW_DYNAMIC_FRAMEWORK_PROVIDER =
-      new BuiltinFunction("new_dynamic_framework_provider") {
-        @SuppressWarnings("unused")
-        // This method is registered statically for skylark, and never called directly.
-        public AppleDynamicFrameworkInfo invoke(
-            AppleSkylarkCommon self,
-            Artifact dylibBinary,
-            ObjcProvider depsObjcProvider,
-            Object dynamicFrameworkDirs,
-            Object dynamicFrameworkFiles) {
-          NestedSet<PathFragment> frameworkDirs;
-          if (dynamicFrameworkDirs == Runtime.NONE) {
-            frameworkDirs = NestedSetBuilder.<PathFragment>emptySet(Order.STABLE_ORDER);
-          } else {
-            Iterable<String> pathStrings =
-                ((SkylarkNestedSet) dynamicFrameworkDirs).getSet(String.class);
-            frameworkDirs =
-                NestedSetBuilder.<PathFragment>stableOrder()
-                    .addAll(Iterables.transform(pathStrings, PathFragment::create))
-                    .build();
-          }
-          NestedSet<Artifact> frameworkFiles =
-              dynamicFrameworkFiles != Runtime.NONE
-                  ? ((SkylarkNestedSet) dynamicFrameworkFiles).getSet(Artifact.class)
-                  : NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER);
-          return new AppleDynamicFrameworkInfo(
-              dylibBinary, depsObjcProvider, frameworkDirs, frameworkFiles);
-        }
-      };
+  public AppleDynamicFrameworkInfo newDynamicFrameworkProvider(
+      Artifact dylibBinary,
+      ObjcProvider depsObjcProvider,
+      Object dynamicFrameworkDirs,
+      Object dynamicFrameworkFiles) {
+    NestedSet<PathFragment> frameworkDirs;
+    if (dynamicFrameworkDirs == Runtime.NONE) {
+      frameworkDirs = NestedSetBuilder.<PathFragment>emptySet(Order.STABLE_ORDER);
+    } else {
+      Iterable<String> pathStrings =
+          ((SkylarkNestedSet) dynamicFrameworkDirs).getSet(String.class);
+      frameworkDirs =
+          NestedSetBuilder.<PathFragment>stableOrder()
+              .addAll(Iterables.transform(pathStrings, PathFragment::create))
+              .build();
+    }
+    NestedSet<Artifact> frameworkFiles =
+        dynamicFrameworkFiles != Runtime.NONE
+            ? ((SkylarkNestedSet) dynamicFrameworkFiles).getSet(Artifact.class)
+            : NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER);
+    return new AppleDynamicFrameworkInfo(
+        dylibBinary, depsObjcProvider, frameworkDirs, frameworkFiles);
+  }
 
   @SkylarkCallable(
       name = "link_multi_arch_binary",
@@ -503,31 +494,20 @@ public class AppleSkylarkCommon {
     }
   }
 
-  @SkylarkSignature(
+  @SkylarkCallable(
     name = "dotted_version",
-    objectType = AppleSkylarkCommon.class,
-    returnType = DottedVersion.class,
     doc = "Creates a new <a href=\"DottedVersion.html\">DottedVersion</a> instance.",
     parameters = {
-      @Param(name = "self", type = AppleSkylarkCommon.class, doc = "The apple_common instance."),
       @Param(
         name = "version",
         type = String.class,
-        named = false,
-        positional = false,
         doc = "The string representation of the DottedVersion."
       )
     }
   )
-  public static final BuiltinFunction DOTTED_VERSION =
-      new BuiltinFunction("dotted_version") {
-        @SuppressWarnings("unused")
-        // This method is registered statically for skylark, and never called directly.
-        public DottedVersion invoke(
-            AppleSkylarkCommon self, String version) {
-          return DottedVersion.fromString(version);
-        }
-      };
+  public DottedVersion dottedVersion(String version) {
+    return DottedVersion.fromString(version);
+  }
 
   @SkylarkCallable(
     name = "objc_proto_aspect",