diff --git a/src/com/facebook/buck/apple/xcode/xcodeproj/XCConfigurationList.java b/src/com/facebook/buck/apple/xcode/xcodeproj/XCConfigurationList.java index 411959c6f3b..073913374c9 100644 --- a/src/com/facebook/buck/apple/xcode/xcodeproj/XCConfigurationList.java +++ b/src/com/facebook/buck/apple/xcode/xcodeproj/XCConfigurationList.java @@ -30,14 +30,14 @@ public class XCConfigurationList extends PBXProjectItem { private List buildConfigurations; private Optional defaultConfigurationName; - private boolean defaultConfigurationIsVisible; + private String defaultConfigurationIsVisible; private final LoadingCache buildConfigurationsByName; public XCConfigurationList(AbstractPBXObjectFactory objectFactory) { buildConfigurations = new ArrayList<>(); defaultConfigurationName = Optional.empty(); - defaultConfigurationIsVisible = false; + defaultConfigurationIsVisible = "0"; buildConfigurationsByName = CacheBuilder.newBuilder() diff --git a/test/com/facebook/buck/features/apple/project/testdata/generating_root_directory_project/Project.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/generating_root_directory_project/Project.xcodeproj/project.pbxproj.expected index fb80b47a6ad..0e77d699eb1 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/generating_root_directory_project/Project.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/generating_root_directory_project/Project.xcodeproj/project.pbxproj.expected @@ -386,7 +386,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04EADDF308200000000 @@ -452,7 +452,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C8479350C8E2F900000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus/Apps/Apps.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_focus/Apps/Apps.xcodeproj/project.pbxproj.expected index 9c3739b0909..3dd1b11d0bd 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus/Apps/Apps.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus/Apps/Apps.xcodeproj/project.pbxproj.expected @@ -219,7 +219,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04EFEC3CBA900000000 @@ -283,7 +283,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C84793001F3E9200000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_focus/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected index 24d5df608d4..ace60087a02 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected @@ -219,7 +219,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E79CC7D5400000000 @@ -250,7 +250,7 @@ defaultConfigurationIsVisible - + 0 E66DC04E79CC7D5500000000 @@ -314,7 +314,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C847930020722200000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus/Libraries/Dep2/Dep2.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_focus/Libraries/Dep2/Dep2.xcodeproj/project.pbxproj.expected index 4c83e73658b..3ca2481466b 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus/Libraries/Dep2/Dep2.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus/Libraries/Dep2/Dep2.xcodeproj/project.pbxproj.expected @@ -205,7 +205,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0020722300000000 @@ -269,7 +269,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C847930020722300000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern/Apps/Apps.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern/Apps/Apps.xcodeproj/project.pbxproj.expected index 71b7d8b9c8b..32128ec0ba3 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern/Apps/Apps.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern/Apps/Apps.xcodeproj/project.pbxproj.expected @@ -219,7 +219,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0E6F340F00000000 @@ -283,7 +283,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C84793001F3E9200000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected index ae1ed7c49a8..3ef49535ffb 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected @@ -301,7 +301,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E79CC7D5400000000 @@ -371,7 +371,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 E66DC04E79CC7D5500000000 @@ -435,7 +435,7 @@ 49524373A439BFE700000002 defaultConfigurationIsVisible - + 0 96C847930020722200000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern_cell/Apps/Apps.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern_cell/Apps/Apps.xcodeproj/project.pbxproj.expected index 71b7d8b9c8b..32128ec0ba3 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern_cell/Apps/Apps.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern_cell/Apps/Apps.xcodeproj/project.pbxproj.expected @@ -219,7 +219,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0E6F340F00000000 @@ -283,7 +283,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C84793001F3E9200000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern_cell/bar/Dep2/Dep2.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern_cell/bar/Dep2/Dep2.xcodeproj/project.pbxproj.expected index 9afcc8e8262..5afdbd5460d 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern_cell/bar/Dep2/Dep2.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus_pattern_cell/bar/Dep2/Dep2.xcodeproj/project.pbxproj.expected @@ -205,7 +205,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0020722300000000 @@ -269,7 +269,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C847930020722300000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus_with_tests/Dep1/Dep1.xcodeproj/project.pbxproj b/test/com/facebook/buck/features/apple/project/testdata/project_focus_with_tests/Dep1/Dep1.xcodeproj/project.pbxproj index c21dbef3f74..500e1809727 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus_with_tests/Dep1/Dep1.xcodeproj/project.pbxproj +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus_with_tests/Dep1/Dep1.xcodeproj/project.pbxproj @@ -178,7 +178,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0020722200000000 @@ -231,7 +231,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C847930020722200000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_focus_with_tests/Tests/Tests.xcodeproj/project.pbxproj b/test/com/facebook/buck/features/apple/project/testdata/project_focus_with_tests/Tests/Tests.xcodeproj/project.pbxproj index c68fa7eae82..b6082c2169c 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_focus_with_tests/Tests/Tests.xcodeproj/project.pbxproj +++ b/test/com/facebook/buck/features/apple/project/testdata/project_focus_with_tests/Tests/Tests.xcodeproj/project.pbxproj @@ -192,7 +192,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E04CF5E0100000000 @@ -245,7 +245,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C8479304CF5E0100000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_halide/Apps/Apps.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_halide/Apps/Apps.xcodeproj/project.pbxproj.expected index c339f227833..6e9a33aff43 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_halide/Apps/Apps.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_halide/Apps/Apps.xcodeproj/project.pbxproj.expected @@ -614,7 +614,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0E6F340F00000000 @@ -704,7 +704,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 E66DC04E0BC2E52700000000 @@ -791,7 +791,7 @@ 49524373A439BFE700000002 defaultConfigurationIsVisible - + 0 E66DC04EC17EBCB700000000 @@ -878,7 +878,7 @@ 49524373A439BFE700000003 defaultConfigurationIsVisible - + 0 E66DC04EA17B1C7900000000 @@ -943,7 +943,7 @@ 49524373A439BFE700000004 defaultConfigurationIsVisible - + 0 96C84793001F3E9200000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_with_unique_library_names/Apps/Apps.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_with_unique_library_names/Apps/Apps.xcodeproj/project.pbxproj.expected index 3b878c4be2e..ea3690cadde 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_with_unique_library_names/Apps/Apps.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_with_unique_library_names/Apps/Apps.xcodeproj/project.pbxproj.expected @@ -314,7 +314,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0E6F340F00000000 @@ -380,7 +380,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C84793001F3E9200000000 diff --git a/test/com/facebook/buck/features/apple/project/testdata/project_with_unique_library_names/Libraries/Libraries.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/project/testdata/project_with_unique_library_names/Libraries/Libraries.xcodeproj/project.pbxproj.expected index d5fbf4ee431..7d067e04075 100644 --- a/test/com/facebook/buck/features/apple/project/testdata/project_with_unique_library_names/Libraries/Libraries.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/project/testdata/project_with_unique_library_names/Libraries/Libraries.xcodeproj/project.pbxproj.expected @@ -345,7 +345,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0020722200000000 @@ -432,7 +432,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 E66DC04E0020722300000000 @@ -497,7 +497,7 @@ 49524373A439BFE700000002 defaultConfigurationIsVisible - + 0 96C84793A7E3D27900000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/generating_root_directory_project/Project.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/projectV2/testdata/generating_root_directory_project/Project.xcodeproj/project.pbxproj.expected index fb80b47a6ad..0e77d699eb1 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/generating_root_directory_project/Project.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/generating_root_directory_project/Project.xcodeproj/project.pbxproj.expected @@ -386,7 +386,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04EADDF308200000000 @@ -452,7 +452,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C8479350C8E2F900000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Apps/Apps.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Apps/Apps.xcodeproj/project.pbxproj.expected index 9c3739b0909..3dd1b11d0bd 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Apps/Apps.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Apps/Apps.xcodeproj/project.pbxproj.expected @@ -219,7 +219,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04EFEC3CBA900000000 @@ -283,7 +283,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C84793001F3E9200000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected index 24d5df608d4..ace60087a02 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Libraries/Dep1/Dep1.xcodeproj/project.pbxproj.expected @@ -219,7 +219,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E79CC7D5400000000 @@ -250,7 +250,7 @@ defaultConfigurationIsVisible - + 0 E66DC04E79CC7D5500000000 @@ -314,7 +314,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C847930020722200000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Libraries/Dep2/Dep2.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Libraries/Dep2/Dep2.xcodeproj/project.pbxproj.expected index 4c83e73658b..3ca2481466b 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Libraries/Dep2/Dep2.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus/Libraries/Dep2/Dep2.xcodeproj/project.pbxproj.expected @@ -205,7 +205,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0020722300000000 @@ -269,7 +269,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C847930020722300000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_pattern/Apps/TestApp.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_pattern/Apps/TestApp.xcodeproj/project.pbxproj.expected index 87af8e46961..7b41769464c 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_pattern/Apps/TestApp.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_pattern/Apps/TestApp.xcodeproj/project.pbxproj.expected @@ -417,7 +417,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E79CC7D5400000000 @@ -508,7 +508,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 E66DC04E79CC7D5500000000 @@ -599,7 +599,7 @@ 49524373A439BFE700000002 defaultConfigurationIsVisible - + 0 E66DC04E0E6F340F00000000 @@ -670,7 +670,7 @@ 49524373A439BFE700000003 defaultConfigurationIsVisible - + 0 96C847930E6F340F00000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_with_tests/Dep1/Dep1.xcodeproj/project.pbxproj b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_with_tests/Dep1/Dep1.xcodeproj/project.pbxproj index f5bdb778e3b..bafd3f05799 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_with_tests/Dep1/Dep1.xcodeproj/project.pbxproj +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_with_tests/Dep1/Dep1.xcodeproj/project.pbxproj @@ -172,7 +172,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0020722200000000 @@ -225,7 +225,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C847930020722200000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_with_tests/Tests/Tests.xcodeproj/project.pbxproj b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_with_tests/Tests/Tests.xcodeproj/project.pbxproj index 20bc005a5b1..119b4224c39 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_with_tests/Tests/Tests.xcodeproj/project.pbxproj +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/project_focus_with_tests/Tests/Tests.xcodeproj/project.pbxproj @@ -186,7 +186,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E04CF5E0100000000 @@ -233,7 +233,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 96C8479304CF5E0100000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/project_halide/Apps/TestApp.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/projectV2/testdata/project_halide/Apps/TestApp.xcodeproj/project.pbxproj.expected index 9c489366ab5..2c9ba60bb6c 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/project_halide/Apps/TestApp.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/project_halide/Apps/TestApp.xcodeproj/project.pbxproj.expected @@ -501,7 +501,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0E6F340F00000000 @@ -608,7 +608,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 E66DC04E9350A4F000000000 @@ -700,7 +700,7 @@ 49524373A439BFE700000002 defaultConfigurationIsVisible - + 0 E66DC04E0BC2E52700000000 @@ -807,7 +807,7 @@ 49524373A439BFE700000003 defaultConfigurationIsVisible - + 0 E66DC04EC17EBCB700000000 @@ -915,7 +915,7 @@ 49524373A439BFE700000004 defaultConfigurationIsVisible - + 0 E66DC04EA17B1C7900000000 @@ -987,7 +987,7 @@ 49524373A439BFE700000005 defaultConfigurationIsVisible - + 0 96C847930E6F340F00000000 diff --git a/test/com/facebook/buck/features/apple/projectV2/testdata/project_with_unique_library_names/Apps/TestApp.xcodeproj/project.pbxproj.expected b/test/com/facebook/buck/features/apple/projectV2/testdata/project_with_unique_library_names/Apps/TestApp.xcodeproj/project.pbxproj.expected index f638f4b5c32..9dd805e88aa 100644 --- a/test/com/facebook/buck/features/apple/projectV2/testdata/project_with_unique_library_names/Apps/TestApp.xcodeproj/project.pbxproj.expected +++ b/test/com/facebook/buck/features/apple/projectV2/testdata/project_with_unique_library_names/Apps/TestApp.xcodeproj/project.pbxproj.expected @@ -503,7 +503,7 @@ 49524373A439BFE700000000 defaultConfigurationIsVisible - + 0 E66DC04E0020722200000000 @@ -611,7 +611,7 @@ 49524373A439BFE700000001 defaultConfigurationIsVisible - + 0 E66DC04E0020722300000000 @@ -703,7 +703,7 @@ 49524373A439BFE700000002 defaultConfigurationIsVisible - + 0 E66DC04E0E6F340F00000000 @@ -810,7 +810,7 @@ 49524373A439BFE700000003 defaultConfigurationIsVisible - + 0 E66DC04E9350A4F000000000 @@ -882,7 +882,7 @@ 49524373A439BFE700000004 defaultConfigurationIsVisible - + 0 96C847930E6F340F00000000