Change xcode_config rule semantics to fit current usage

- require_defined_versions is deprecated and a no-op. A version must match existing defined versions if any exist
- default label must be present in versions labels if any are defined
- default label may not exist if no versions are defined
- when --xcode_version is specified on the command line, it must match a defined version if any are defined. If none are defined, this flag is a no-op

RELNOTES: None.
PiperOrigin-RevId: 167616628

1 files changed, 0 insertions, 4 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
index 08b1d0b191..26033f41a7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
@@ -600,7 +600,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
   @Test
   public void testCompilationActionsWithEmbeddedBitcode() throws Exception {
     useConfiguration(
-        "--xcode_version=7.1",
         "--ios_multi_cpus=arm64",
         "--apple_bitcode=embedded");
     createLibraryTargetWriter("//objc:lib")
@@ -616,7 +615,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
   @Test
   public void testCompilationActionsWithEmbeddedBitcodeMarkers() throws Exception {
     useConfiguration(
-        "--xcode_version=7.1",
         "--ios_multi_cpus=arm64",
         "--apple_bitcode=embedded_markers");
 
@@ -634,7 +632,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
   public void testCompilationActionsWithNoBitcode() throws Exception {
     useConfiguration(
         "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL,
-        "--xcode_version=7.1",
         "--ios_multi_cpus=arm64",
         "--apple_bitcode=none");
 
@@ -656,7 +653,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase {
   public void testCompilationActionsWithBitcode_simulator() throws Exception {
     useConfiguration(
         "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL,
-        "--xcode_version=7.1",
         "--ios_multi_cpus=x86_64",
         "--apple_bitcode=embedded");