Automated rollback of commit c1be54b.

*** Reason for rollback ***

Failures in nightly: b/123841211

*** Original change description ***

Enable --incompatible_disable_objc_provider_resources by default.

#5710

RELNOTES: --incompatible_disable_objc_provider_resources is now enabled by default. This disables ObjcProvider's fields related to resource processing.
PiperOrigin-RevId: 232305883

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

@@ -237,15 +237,16 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable
   public boolean requireFeatureConfigurationForPic;
 
   @Option(
-      name = "incompatible_disable_objc_provider_resources",
-      defaultValue = "true",
+    name = "incompatible_disable_objc_provider_resources",
+    defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
-      metadataTags = {
-        OptionMetadataTag.INCOMPATIBLE_CHANGE,
-        OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
-      },
-      help = "If set to true, disallow use of deprecated resource fields on the Objc provider.")
+    metadataTags = {
+      OptionMetadataTag.INCOMPATIBLE_CHANGE,
+      OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+    },
+    help = "If set to true, disallow use of deprecated resource fields on the Objc provider."
+  )
   public boolean incompatibleDisableObjcProviderResources;
 
   @Option(

src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java

@@ -217,7 +217,7 @@ public static Builder builderWithDefaults() {
           .incompatibleDepsetIsNotIterable(false)
           .incompatibleDepsetUnion(false)
           .incompatibleDisableDeprecatedAttrParams(false)
-          .incompatibleDisableObjcProviderResources(true)
+          .incompatibleDisableObjcProviderResources(false)
           .incompatibleDisallowDataTransition(true)
           .incompatibleDisallowDictPlus(false)
           .incompatibleDisallowFileType(false)

src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java

@@ -17,7 +17,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.rules.objc.BundleableFile.BUNDLED_FIELD;
 import static com.google.devtools.build.lib.rules.objc.BundleableFile.BUNDLE_PATH_FIELD;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
+import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -115,22 +115,23 @@ public void testSkylarkProviderRetrievalNoneIfNoProvider() throws Exception {
         "    srcs = ['a.cc'],",
         "    hdrs = ['b.h']",
         ")");
-    AssertionError e =
-        assertThrows(
-            AssertionError.class, () -> getConfiguredTarget("//examples/apple_skylark:my_target"));
-    assertThat(e)
-        .hasMessageThat()
-        .contains("File \"/workspace/examples/apple_skylark/BUILD\", line 3");
+    try {
+      getConfiguredTarget("//examples/apple_skylark:my_target");
+      fail("Should throw assertion error");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessageThat()
+          .contains("File \"/workspace/examples/apple_skylark/BUILD\", line 3");
       assertThat(e).hasMessageThat().contains("my_rule(name = 'my_target')");
       assertThat(e)
           .hasMessageThat()
           .contains("File \"/workspace/examples/rule/apple_rules.bzl\", line 3, in my_rule_impl");
       assertThat(e).hasMessageThat().contains("dep.objc");
-    assertThat(e)
-        .hasMessageThat()
-        .contains(
-            "<target //examples/apple_skylark:lib> (rule 'cc_library') "
-                + "doesn't have provider 'objc'");
+      assertThat(e)
+          .hasMessageThat()
+          .contains("<target //examples/apple_skylark:lib> (rule 'cc_library') "
+              + "doesn't have provider 'objc'");
+    }
   }
 
   @Test
@@ -970,71 +971,73 @@ public void testRuleReturnsObjcProviderInList() throws Exception {
 
   @Test
   public void testSkylarkErrorOnBadObjcProviderInputKey() throws Exception {
-    AssertionError e =
-        assertThrows(
-            AssertionError.class,
-            () ->
-                createObjcProviderSkylarkTarget(
-                    "   created_provider = apple_common.new_objc_provider(foo=depset(['bar']))",
-                    "   return struct(objc=created_provider)"));
-    assertThat(e).hasMessageThat().contains(String.format(AppleSkylarkCommon.BAD_KEY_ERROR, "foo"));
+    try {
+      createObjcProviderSkylarkTarget(
+          "   created_provider = apple_common.new_objc_provider(foo=depset(['bar']))",
+          "   return struct(objc=created_provider)");
+      fail("Should throw AssertionError");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessageThat()
+          .contains(String.format(AppleSkylarkCommon.BAD_KEY_ERROR, "foo"));
+    }
   }
 
   @Test
   public void testSkylarkErrorOnNonSetObjcProviderInputValue() throws Exception {
-    AssertionError e =
-        assertThrows(
-            AssertionError.class,
-            () ->
-                createObjcProviderSkylarkTarget(
-                    "   created_provider = apple_common.new_objc_provider(library='bar')",
-                    "   return struct(objc=created_provider)"));
-    assertThat(e)
-        .hasMessageThat()
-        .contains(String.format(AppleSkylarkCommon.NOT_SET_ERROR, "library", "string"));
+    try {
+      createObjcProviderSkylarkTarget(
+          "   created_provider = apple_common.new_objc_provider(library='bar')",
+          "   return struct(objc=created_provider)");
+      fail("Should throw AssertionError");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessageThat()
+          .contains(String.format(AppleSkylarkCommon.NOT_SET_ERROR, "library", "string"));
+    }
   }
 
   @Test
   public void testSkylarkErrorOnObjcProviderInputValueWrongSetType() throws Exception {
-    AssertionError e =
-        assertThrows(
-            AssertionError.class,
-            () ->
-                createObjcProviderSkylarkTarget(
-                    "   created_provider = apple_common.new_objc_provider(library=depset(['bar']))",
-                    "   return struct(objc=created_provider)"));
-    assertThat(e)
-        .hasMessageThat()
-        .contains(
-            String.format(AppleSkylarkCommon.BAD_SET_TYPE_ERROR, "library", "File", "string"));
+    try {
+      createObjcProviderSkylarkTarget(
+          "   created_provider = apple_common.new_objc_provider(library=depset(['bar']))",
+          "   return struct(objc=created_provider)");
+      fail("Should throw AssertionError");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessageThat()
+          .contains(
+              String.format(AppleSkylarkCommon.BAD_SET_TYPE_ERROR, "library", "File", "string"));
+    }
   }
 
   @Test
   public void testSkylarkErrorOnNonIterableObjcProviderProviderValue() throws Exception {
-    AssertionError e =
-        assertThrows(
-            AssertionError.class,
-            () ->
-                createObjcProviderSkylarkTarget(
-                    "   created_provider = apple_common.new_objc_provider(providers='bar')",
-                    "   return struct(objc=created_provider)"));
-    assertThat(e)
-        .hasMessageThat()
-        .contains(String.format(AppleSkylarkCommon.BAD_PROVIDERS_ITER_ERROR, "string"));
+    try {
+      createObjcProviderSkylarkTarget(
+          "   created_provider = apple_common.new_objc_provider(providers='bar')",
+          "   return struct(objc=created_provider)");
+      fail("Should throw AssertionError");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessageThat()
+          .contains(String.format(AppleSkylarkCommon.BAD_PROVIDERS_ITER_ERROR, "string"));
+    }
   }
 
   @Test
   public void testSkylarkErrorOnBadIterableObjcProviderProviderValue() throws Exception {
-    AssertionError e =
-        assertThrows(
-            AssertionError.class,
-            () ->
-                createObjcProviderSkylarkTarget(
-                    "   created_provider = apple_common.new_objc_provider(providers=['bar'])",
-                    "   return struct(objc=created_provider)"));
-    assertThat(e)
-        .hasMessageThat()
-        .contains(String.format(AppleSkylarkCommon.BAD_PROVIDERS_ELEM_ERROR, "string"));
+    try {
+      createObjcProviderSkylarkTarget(
+          "   created_provider = apple_common.new_objc_provider(providers=['bar'])",
+          "   return struct(objc=created_provider)");
+      fail("Should throw AssertionError");
+    } catch (AssertionError e) {
+      assertThat(e)
+          .hasMessageThat()
+          .contains(String.format(AppleSkylarkCommon.BAD_PROVIDERS_ELEM_ERROR, "string"));
+    }
   }
 
   @Test
@@ -1076,7 +1079,6 @@ public void testEmptyObjcProviderKeysArePresent() throws Exception {
 
   @Test
   public void testSkylarkCanAccessProvidedBundleFiles() throws Exception {
-    setSkylarkSemanticsOptions("--incompatible_disable_objc_provider_resources=false");
     // Since the collections of structs with Artifact values are extremely difficult to test with
     // Truth, we fudge them in the Skylark side to return easily comparable dictionaries instead.
     scratch.file("examples/rule/BUILD");
@@ -1335,10 +1337,12 @@ public void testDottedVersion_invalid() throws Exception {
         "    name = 'my_target',",
         ")");
 
-    AssertionError e =
-        assertThrows(
-            AssertionError.class, () -> getConfiguredTarget("//examples/apple_skylark:my_target"));
-    assertThat(e).hasMessageThat().contains("Dotted version components must all be of the form");
+    try {
+      getConfiguredTarget("//examples/apple_skylark:my_target");
+      fail("Expected an error to be thrown for invalid dotted version string");
+    } catch (AssertionError e) {
+      assertThat(e).hasMessageThat().contains("Dotted version components must all be of the form");
+    }
   }
 
   /**