From 9cb5c3d91dca1d701e2f20ed7809232a3ad1c96f Mon Sep 17 00:00:00 2001
From: dmaclach <dmaclach@google.com>
Date: Wed, 15 May 2019 12:16:35 -0700
Subject: [PATCH] Finish removing require_defined_version from xcode_version.

PiperOrigin-RevId: 248380385
---
 .../lib/rules/apple/XcodeConfigRule.java      |  9 ------
 .../lib/rules/apple/XcodeConfigTest.java      | 30 ++-----------------
 2 files changed, 3 insertions(+), 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
index 13a4172a6d2fc9..50823fea26cded 100644
--- 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
index 36fe9b2fb99cb6..4f33b7c62ecfd2 100644
--- 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'],",
         ")",
         "",