Delete resource fields from ObjcProvider and related code.

RELNOTES[INC]: --incompatible_disable_objc_provider_resources no longer has effect. Use of deprecated resource fields on the Objc provider is now disallowed regardless of this flag. PiperOrigin-RevId: 247225773
bazelbuild · May 8, 2019 · 9a005f7 · 9a005f7
1 parent 2aa73ab
commit 9a005f7
Show file tree

Hide file tree

Showing 18 changed files with 5 additions and 2,048 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -219,7 +219,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
         OptionMetadataTag.INCOMPATIBLE_CHANGE,
         OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
       },
-      help = "If set to true, disallow use of deprecated resource fields on the Objc provider.")
+      help = "Unused. Will be removed in future versions of Bazel.")
   public boolean incompatibleDisableObjcProviderResources;
 
   // For Bazel, this flag is a no-op. Bazel doesn't support built-in third party license checking

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
@@ -185,18 +185,13 @@ public ObjcProvider newObjcProvider(
       Boolean usesSwift,
       SkylarkDict<?, ?> kwargs,
       Environment environment) {
-    boolean disableObjcResourceKeys =
-        environment.getSemantics().incompatibleDisableObjcProviderResources();
     ObjcProvider.Builder resultBuilder = new ObjcProvider.Builder(environment.getSemantics());
     if (usesSwift) {
       resultBuilder.add(ObjcProvider.FLAG, ObjcProvider.Flag.USES_SWIFT);
     }
     for (Map.Entry<?, ?> entry : kwargs.entrySet()) {
       Key<?> key = ObjcProvider.getSkylarkKeyForString((String) entry.getKey());
       if (key != null) {
-        if (disableObjcResourceKeys && ObjcProvider.isDeprecatedResourceKey(key)) {
-          throw new IllegalArgumentException(String.format(BAD_KEY_ERROR, entry.getKey()));
-        }
         resultBuilder.addElementsFromSkylark(key, entry.getValue());
       } else if (entry.getKey().equals("providers")) {
         resultBuilder.addProvidersFromSkylark(entry.getValue());

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
@@ -49,21 +49,12 @@
 public class AppleStaticLibrary implements RuleConfiguredTargetFactory {
 
   /**
-   * Set of {@link ObjcProvider} values which are propagated from dependencies to dependers by
-   * this rule.
+   * Set of {@link ObjcProvider} values which are propagated from dependencies to dependers by this
+   * rule.
    */
   private static final ImmutableSet<Key<?>> PROPAGATE_KEYS =
       ImmutableSet.<Key<?>>of(
-          ObjcProvider.ASSET_CATALOG,
-          ObjcProvider.BUNDLE_FILE,
-          ObjcProvider.SDK_DYLIB,
-          ObjcProvider.SDK_FRAMEWORK,
-          ObjcProvider.STORYBOARD,
-          ObjcProvider.STRINGS,
-          ObjcProvider.WEAK_SDK_FRAMEWORK,
-          ObjcProvider.XCDATAMODEL,
-          ObjcProvider.XIB,
-          ObjcProvider.XCASSETS_DIR);
+          ObjcProvider.SDK_DYLIB, ObjcProvider.SDK_FRAMEWORK, ObjcProvider.WEAK_SDK_FRAMEWORK);
 
   @VisibleForTesting
   static final String UNSUPPORTED_PLATFORM_TYPE_ERROR_FORMAT =

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleMergeControlBytes.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleMergeControlBytes.java
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleableFile.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleableFile.java