Finish removing require_defined_version from xcode_version.

PiperOrigin-RevId: 248380385
bazelbuild · May 15, 2019 · 9cb5c3d · 9cb5c3d
1 parent f72a071
commit 9cb5c3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 36 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java
@@ -17,7 +17,6 @@
 import static com.google.devtools.build.lib.packages.Attribute.attr;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
-import static com.google.devtools.build.lib.syntax.Type.BOOLEAN;
 
 import com.google.devtools.build.lib.analysis.BaseRuleClasses;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
@@ -32,7 +31,6 @@ public class XcodeConfigRule implements RuleDefinition {
   public static final String XCODE_CONFIG_ATTR_NAME = ":xcode_config";
   static final String DEFAULT_ATTR_NAME = "default";
   static final String VERSIONS_ATTR_NAME = "versions";
-  static final String REQUIRE_DEFINED_VERSIONS_ATTR_NAME = "require_defined_version";
 
   @Override
   public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
@@ -60,13 +58,6 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env)
             .allowedRuleClasses("xcode_version")
             .allowedFileTypes()
             .nonconfigurable("this rule determines configuration"))
-        /* <!-- #BLAZE_RULE(xcode_config).ATTRIBUTE(version) -->
-        Deprecated. This attribute has no effect.
-        <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
-        // TODO(b/64576392): Remove this attribute.
-        .add(attr(REQUIRE_DEFINED_VERSIONS_ATTR_NAME, BOOLEAN)
-            .value(false)
-            .nonconfigurable("this rule determines configuration"))
         .build();
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java
@@ -208,11 +208,10 @@ public void testDefaultVersion_configSetting() throws Exception {
   }
 
   @Test
-  public void testRequiresDefined_validVersion() throws Exception {
+  public void testValidVersion() throws Exception {
     scratch.file("xcode/BUILD",
         "xcode_config(",
         "    name = 'foo',",
-        "    require_defined_version = 1,",
         "    versions = [':version512'],",
         "    default = ':version512',",
         ")",
@@ -228,11 +227,10 @@ public void testRequiresDefined_validVersion() throws Exception {
   }
 
   @Test
-  public void testRequiresDefined_validAlias_dottedVersion() throws Exception {
+  public void testValidAlias_dottedVersion() throws Exception {
     scratch.file("xcode/BUILD",
         "xcode_config(",
         "    name = 'foo',",
-        "    require_defined_version = 1,",
         "    versions = [':version512'],",
         "    default = ':version512',",
         ")",
@@ -248,11 +246,10 @@ public void testRequiresDefined_validAlias_dottedVersion() throws Exception {
   }
 
   @Test
-  public void testRequiresDefined_validAlias_nonNumerical() throws Exception {
+  public void testValidAlias_nonNumerical() throws Exception {
     scratch.file("xcode/BUILD",
         "xcode_config(",
         "    name = 'foo',",
-        "    require_defined_version = 1,",
         "    versions = [':version512'],",
         "    default = ':version512',",
         ")",
@@ -267,31 +264,11 @@ public void testRequiresDefined_validAlias_nonNumerical() throws Exception {
     assertXcodeVersion("5.1.2");
   }
 
-  @Test
-  public void testRequiresDefined_validDefault() throws Exception {
-    scratch.file("xcode/BUILD",
-        "xcode_config(",
-        "    name = 'foo',",
-        "    default = ':version512',",
-        "    versions = [':version512'],",
-        ")",
-        "",
-        "xcode_version(",
-        "    name = 'version512',",
-        "    version = '5.1.2',",
-        "    aliases = ['5', '5.1'],",
-        ")");
-    useConfiguration("--xcode_version_config=//xcode:foo");
-
-    assertXcodeVersion("5.1.2");
-  }
-
   @Test
   public void testInvalidXcodeSpecified() throws Exception {
     scratch.file("xcode/BUILD",
         "xcode_config(",
         "    name = 'foo',",
-        "    require_defined_version = 1,",
         "    versions = [':version512', ':version84'],",
         "    default = ':version512',",
         ")",
@@ -317,7 +294,6 @@ public void testRequiresDefault() throws Exception {
     scratch.file("xcode/BUILD",
         "xcode_config(",
         "    name = 'foo',",
-        "    require_defined_version = 1,",
         "    versions = [':version512'],",
         ")",
         "",