From 500c45acbc85667f2bbdcfd98ba2ac0d715ddbd5 Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Wed, 4 May 2022 15:09:41 -0500 Subject: [PATCH] Rename "Bazel Dependencies" target to remove space (#398) This is temporary until https://github.com/bazel-contrib/rules_bazel_integration_test/issues/62 is addressed. --- doc/design/high-level.md | 2 +- .../fixtures/bwb.xcodeproj/project.pbxproj | 244 +++++++------- .../fixtures/bwx.xcodeproj/project.pbxproj | 310 +++++++++--------- .../fixtures/cc/bwb.xcodeproj/project.pbxproj | 116 +++---- .../fixtures/cc/bwx.xcodeproj/project.pbxproj | 138 ++++---- .../bwb.xcodeproj/project.pbxproj | 196 +++++------ .../bwx.xcodeproj/project.pbxproj | 190 +++++------ .../generator/bwb.xcodeproj/project.pbxproj | 240 +++++++------- .../generator/bwx.xcodeproj/project.pbxproj | 248 +++++++------- .../tvos_app/bwb.xcodeproj/project.pbxproj | 108 +++--- .../tvos_app/bwx.xcodeproj/project.pbxproj | 120 +++---- ...Generator+AddBazelDependenciesTarget.swift | 4 +- tools/generator/test/Fixtures.swift | 4 +- xcodeproj/internal/installer.template.sh | 4 +- 14 files changed, 962 insertions(+), 962 deletions(-) diff --git a/doc/design/high-level.md b/doc/design/high-level.md index ca63a26bf8..456886bf71 100644 --- a/doc/design/high-level.md +++ b/doc/design/high-level.md @@ -171,7 +171,7 @@ fully control the build. Here are some benefits that the proxy provides over "Build with Bazel": -- No additional "Bazel Dependencies" target in the build graph +- No additional "BazelDependencies" target in the build graph - Removal of duplicate warnings/errors - More stable Indexing - User created schemes (without defining bazel rules to create them) work as diff --git a/examples/ios_app/test/fixtures/bwb.xcodeproj/project.pbxproj b/examples/ios_app/test/fixtures/bwb.xcodeproj/project.pbxproj index 83f7672edf..310c943f6d 100644 --- a/examples/ios_app/test/fixtures/bwb.xcodeproj/project.pbxproj +++ b/examples/ios_app/test/fixtures/bwb.xcodeproj/project.pbxproj @@ -7,19 +7,19 @@ objects = { /* Begin PBXAggregateTarget section */ - 9281ECD979418C4678530C3F /* Bazel Dependencies */ = { + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - 2E15CEFF1306DCFD4654C60B /* Bazel Build */, - 391E7CA7B16FAFAE0457D1C2 /* Copy Files */, - 77D46E44C108C6CEE2F89E0D /* Fix Modulemaps */, - 4CBF24D403529E7553176153 /* Fix Info.plists */, + 9A630CF63C380FAE522825A9 /* Bazel Build */, + CF398643BE2886B2AAE69745 /* Copy Files */, + FF28C25A21C1530CA1AF5318 /* Fix Modulemaps */, + FC6E45C2D1E2FBCFC2D1471E /* Fix Info.plists */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -39,27 +39,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 110986C710000A69ABE319EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0805833D09730531AD081697 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; - }; - 11A1653A0467DE3D23FB985F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0805833D09730531AD081697 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; - }; - 1CF9C88B9ECC02A32824AAE3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0805833D09730531AD081697 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; - }; 253F301DFAC4DBD74F463E32 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; @@ -67,19 +46,19 @@ remoteGlobalIDString = F175A7E1019A952CA7F66BBC; remoteInfo = TestingUtils; }; - 3BA2A8D5AC47F95AE6B6270F /* PBXContainerItemProxy */ = { + 2A5B509CA8C5CE8F44BAEC83 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - 791B7678D5C0BBAAA4BECD8F /* PBXContainerItemProxy */ = { + 5A6662160CF76BEF84975212 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; 7DC9F0A22A7B1E5E310197D9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -95,6 +74,13 @@ remoteGlobalIDString = DEF15AA97EC0FE28A9A97CAA; remoteInfo = Example; }; + 8615C428856EE8364158AD36 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0805833D09730531AD081697 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; + }; 97350A84E43A3D97DB7FF16B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; @@ -116,6 +102,13 @@ remoteGlobalIDString = F175A7E1019A952CA7F66BBC; remoteInfo = TestingUtils; }; + 9E02FA40F7B55953CA4B031D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0805833D09730531AD081697 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; + }; A0F480345DF9DC369DA636A3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; @@ -130,26 +123,33 @@ remoteGlobalIDString = 34820134F30D904FFA06D27A; remoteInfo = Utils; }; - B71878DACFF4D4B444BFDCD1 /* PBXContainerItemProxy */ = { + DDD61C8C1CFA249BBE0E369C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - C0D80619D2C42BB73BC97511 /* PBXContainerItemProxy */ = { + EBD0C87C46CE3A0065D73AA0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = DEF15AA97EC0FE28A9A97CAA; + remoteInfo = Example; }; - EBD0C87C46CE3A0065D73AA0 /* PBXContainerItemProxy */ = { + F5E9D31D539D4E97AACBE385 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = DEF15AA97EC0FE28A9A97CAA; - remoteInfo = Example; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; + }; + FE47674BD75BF763F743C9E6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0805833D09730531AD081697 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; /* End PBXContainerItemProxy section */ @@ -617,7 +617,7 @@ buildRules = ( ); dependencies = ( - D154D1693D52F814DF193634 /* PBXTargetDependency */, + 6160161B0AEDB993335C4D34 /* PBXTargetDependency */, 525486294F10747C8F6172F4 /* PBXTargetDependency */, ); name = Utils; @@ -634,7 +634,7 @@ buildRules = ( ); dependencies = ( - 0E5E247666C0F0835980B66F /* PBXTargetDependency */, + 3D0D293F05E542E6491A9560 /* PBXTargetDependency */, ); name = CoreUtilsObjC; productName = CoreUtilsObjC; @@ -650,7 +650,7 @@ buildRules = ( ); dependencies = ( - 8752815C18F0ED1D8E490F5A /* PBXTargetDependency */, + A8CA6A2F871918C9595AE3C9 /* PBXTargetDependency */, C7F459DED8FA911CD017E629 /* PBXTargetDependency */, 4340DE112FCC7EC33567A231 /* PBXTargetDependency */, 6CF6D5E9860D81504C950316 /* PBXTargetDependency */, @@ -669,7 +669,7 @@ buildRules = ( ); dependencies = ( - 5DFE3D6D6371279C87EFC9F6 /* PBXTargetDependency */, + CD8F780ECEDB33369CA6059E /* PBXTargetDependency */, 4D0DFDD11CB698CEA15C699E /* PBXTargetDependency */, ); name = ExampleUITests.__internal__.__test_bundle; @@ -686,7 +686,7 @@ buildRules = ( ); dependencies = ( - 1D5CD5B9BA8C334C7A88A805 /* PBXTargetDependency */, + C1C989EE8C77D1DBF32859E6 /* PBXTargetDependency */, F670F941F6741D0D3E7AC4A3 /* PBXTargetDependency */, C2C1C85130B75A2A4AA73509 /* PBXTargetDependency */, D32ED35208CAB32B6C2A56B3 /* PBXTargetDependency */, @@ -706,7 +706,7 @@ buildRules = ( ); dependencies = ( - 2047D4B3EA4C6F4853601156 /* PBXTargetDependency */, + 5F96E438EF4C12858E3D604D /* PBXTargetDependency */, 4D0F270A9C4875B0F9EFA648 /* PBXTargetDependency */, ); name = Example; @@ -724,7 +724,7 @@ buildRules = ( ); dependencies = ( - 7609B5394B41B8F5C0A07CBD /* PBXTargetDependency */, + 96160E1B8AE0CFB0577BE6A9 /* PBXTargetDependency */, ); name = TestingUtils; productName = TestingUtils; @@ -754,7 +754,7 @@ LastSwiftMigration = 1320; TestTargetID = DEF15AA97EC0FE28A9A97CAA; }; - 9281ECD979418C4678530C3F = { + 7E7D155EBCA520F35DEA3571 = { CreatedOnToolsVersion = 13.2.1; }; BBF4D59A51801FF17E35E34E = { @@ -791,7 +791,7 @@ projectDirPath = ../..; projectRoot = ""; targets = ( - 9281ECD979418C4678530C3F /* Bazel Dependencies */, + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */, 64AE6000A6317B9C077F3B1E /* CoreUtilsObjC */, DEF15AA97EC0FE28A9A97CAA /* Example */, 7E5DFA29686635FDE423D8F4 /* ExampleObjcTests.__internal__.__test_bundle */, @@ -804,7 +804,24 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 2E15CEFF1306DCFD4654C60B /* Bazel Build */ = { + 3D4CFD8FC03BCBC4496FF968 /* Copy Swift Generated Header */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(DERIVED_FILE_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", + ); + name = "Copy Swift Generated Header"; + outputPaths = ( + "$(CONFIGURATION_BUILD_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 9A630CF63C380FAE522825A9 /* Bazel Build */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -824,7 +841,7 @@ shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n if [[ -f \"$HOME/.lldbinit\" ]]; then\n home_init=\"command source ~/.lldbinit\n\n \"\n else\n home_init=\"\"\n fi\n\n cat < \"$BAZEL_LLDB_INIT\"\n$home_init\\\n# Set \\`CWD\\` to \\`\\$SRCROOT\\` so relative paths in binaries work\nplatform settings -w \"$SRCROOT\"\n\n# \"Undo\" \\`-debug-prefix-map\\`\nsettings set target.source-map ./external/ \"$external\"\nsettings append target.source-map ./ \"$SRCROOT\"\nEOF\nfi\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\noutput_groups=()\nif [ -s \"$BAZEL_BUILD_OUTPUT_GROUPS_FILE\" ]; then\n while IFS= read -r output_group; do\n output_groups+=(\"--output_groups=+$output_group\")\n done < \"$BAZEL_BUILD_OUTPUT_GROUPS_FILE\"\nfi\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n ${output_groups[@]+\"${output_groups[@]}\"} \\\n //test/fixtures:fixture_bwb\n"; showEnvVarsInLog = 0; }; - 391E7CA7B16FAFAE0457D1C2 /* Copy Files */ = { + CF398643BE2886B2AAE69745 /* Copy Files */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -845,24 +862,7 @@ shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; showEnvVarsInLog = 0; }; - 3D4CFD8FC03BCBC4496FF968 /* Copy Swift Generated Header */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(DERIVED_FILE_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", - ); - name = "Copy Swift Generated Header"; - outputPaths = ( - "$(CONFIGURATION_BUILD_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 4CBF24D403529E7553176153 /* Fix Info.plists */ = { + FC6E45C2D1E2FBCFC2D1471E /* Fix Info.plists */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -883,7 +883,7 @@ shellScript = "set -euo pipefail\n\nwhile IFS= read -r input; do\n output=\"${input%.plist}.xcode.plist\"\n cp \"$input\" \"$output\"\n plutil -remove UIDeviceFamily \"$output\" || true\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n"; showEnvVarsInLog = 0; }; - 77D46E44C108C6CEE2F89E0D /* Fix Modulemaps */ = { + FF28C25A21C1530CA1AF5318 /* Fix Modulemaps */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -969,23 +969,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 0E5E247666C0F0835980B66F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = C0D80619D2C42BB73BC97511 /* PBXContainerItemProxy */; - }; - 1D5CD5B9BA8C334C7A88A805 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 110986C710000A69ABE319EB /* PBXContainerItemProxy */; - }; - 2047D4B3EA4C6F4853601156 /* PBXTargetDependency */ = { + 3D0D293F05E542E6491A9560 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 1CF9C88B9ECC02A32824AAE3 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 9E02FA40F7B55953CA4B031D /* PBXContainerItemProxy */; }; 4340DE112FCC7EC33567A231 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1011,11 +999,17 @@ target = 64AE6000A6317B9C077F3B1E /* CoreUtilsObjC */; targetProxy = 97350A84E43A3D97DB7FF16B /* PBXContainerItemProxy */; }; - 5DFE3D6D6371279C87EFC9F6 /* PBXTargetDependency */ = { + 5F96E438EF4C12858E3D604D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = B71878DACFF4D4B444BFDCD1 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = DDD61C8C1CFA249BBE0E369C /* PBXContainerItemProxy */; + }; + 6160161B0AEDB993335C4D34 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = F5E9D31D539D4E97AACBE385 /* PBXContainerItemProxy */; }; 6CF6D5E9860D81504C950316 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1023,17 +1017,23 @@ target = 34820134F30D904FFA06D27A /* Utils */; targetProxy = 7DC9F0A22A7B1E5E310197D9 /* PBXContainerItemProxy */; }; - 7609B5394B41B8F5C0A07CBD /* PBXTargetDependency */ = { + 96160E1B8AE0CFB0577BE6A9 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = FE47674BD75BF763F743C9E6 /* PBXContainerItemProxy */; + }; + A8CA6A2F871918C9595AE3C9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 791B7678D5C0BBAAA4BECD8F /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 8615C428856EE8364158AD36 /* PBXContainerItemProxy */; }; - 8752815C18F0ED1D8E490F5A /* PBXTargetDependency */ = { + C1C989EE8C77D1DBF32859E6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 11A1653A0467DE3D23FB985F /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 5A6662160CF76BEF84975212 /* PBXContainerItemProxy */; }; C2C1C85130B75A2A4AA73509 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1047,11 +1047,11 @@ target = DEF15AA97EC0FE28A9A97CAA /* Example */; targetProxy = A0F480345DF9DC369DA636A3 /* PBXContainerItemProxy */; }; - D154D1693D52F814DF193634 /* PBXTargetDependency */ = { + CD8F780ECEDB33369CA6059E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 3BA2A8D5AC47F95AE6B6270F /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 2A5B509CA8C5CE8F44BAEC83 /* PBXContainerItemProxy */; }; D32ED35208CAB32B6C2A56B3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1290,6 +1290,18 @@ }; name = Debug; }; + 5AFD85147E5F7EEA259481C2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + INDEX_FORCE_SCRIPT_EXECUTION = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; 9A5566483B61F9D10CB67C4D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1460,18 +1472,6 @@ }; name = Debug; }; - D6C64C86AFDFF55D55C69DFF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - INDEX_FORCE_SCRIPT_EXECUTION = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; ED022D7827FA072088152A34 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1691,18 +1691,18 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - B7B2838D5E51E99F559A42AC /* Build configuration list for PBXNativeTarget "Utils" */ = { + 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { isa = XCConfigurationList; buildConfigurations = ( - A56BEE637DA1B6A442624451 /* Debug */, + 5AFD85147E5F7EEA259481C2 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { + B7B2838D5E51E99F559A42AC /* Build configuration list for PBXNativeTarget "Utils" */ = { isa = XCConfigurationList; buildConfigurations = ( - D6C64C86AFDFF55D55C69DFF /* Debug */, + A56BEE637DA1B6A442624451 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; diff --git a/examples/ios_app/test/fixtures/bwx.xcodeproj/project.pbxproj b/examples/ios_app/test/fixtures/bwx.xcodeproj/project.pbxproj index ba91a5fa03..c1c75e2833 100644 --- a/examples/ios_app/test/fixtures/bwx.xcodeproj/project.pbxproj +++ b/examples/ios_app/test/fixtures/bwx.xcodeproj/project.pbxproj @@ -7,19 +7,19 @@ objects = { /* Begin PBXAggregateTarget section */ - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */ = { + FE59281FE487F27A37DC2EE7 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - EFD5DC5BF35D589213C98597 /* Generate Files */, - 14DE13B950F0A4E49F5CF508 /* Copy Files */, - D59B838F58CCDC97935C509C /* Fix Modulemaps */, - FF8B0244BAA1F32D8929C997 /* Fix Info.plists */, + 773C70B69E7F801B38FDC01C /* Generate Files */, + 87B0BF431191C40A5DA3740B /* Copy Files */, + 4A203495210B86B9111BD6C9 /* Fix Modulemaps */, + A1B677A301B894FBD0B5AB58 /* Fix Info.plists */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -68,40 +68,33 @@ remoteGlobalIDString = 42A7256A505DA3DFEA69C941; remoteInfo = TestingUtils; }; - 4586EA019F9A0AEB5C3C760A /* PBXContainerItemProxy */ = { + 1BED42F39BAEC2F668EC2467 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - 5372562177EBC1BD93515F6C /* PBXContainerItemProxy */ = { + 6ED91B607D49D808DA25E0DE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 225701F2BB3EA192424F07FE; + remoteInfo = ExampleResources; }; - 55D8683784886A4A2DE0797F /* PBXContainerItemProxy */ = { + 7234AC8138012B37C733E0DD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - 6696E8D173BF56A40F4EBFC3 /* PBXContainerItemProxy */ = { + 74B37375F37636668668D9F8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; - }; - 6ED91B607D49D808DA25E0DE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 225701F2BB3EA192424F07FE; - remoteInfo = ExampleResources; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; 74D605DCFD345388C0AEF131 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -110,19 +103,19 @@ remoteGlobalIDString = 42E984F26D5B4ECBE0F0F076; remoteInfo = Utils; }; - 8499CD2F34D395AA377AFF38 /* PBXContainerItemProxy */ = { + 802904D3BC7B73ACCD2F47BE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 9E46111B59CD5CC4865299C2; - remoteInfo = Example; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - 8BA5150BAD500ED81E254043 /* PBXContainerItemProxy */ = { + 8499CD2F34D395AA377AFF38 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 9E46111B59CD5CC4865299C2; + remoteInfo = Example; }; 93BD7009B9CA0DBECFEDB13C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -138,40 +131,54 @@ remoteGlobalIDString = 225701F2BB3EA192424F07FE; remoteInfo = ExampleResources; }; - 9BC443317E7CE097B2BC3F22 /* PBXContainerItemProxy */ = { + A2202E540FBEDC3B11423E69 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 9EEE562EF383D06390A55602; + remoteInfo = ExternalResources; }; - A2202E540FBEDC3B11423E69 /* PBXContainerItemProxy */ = { + BAAECFBDB24D9E22FDDAE7AB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 9EEE562EF383D06390A55602; - remoteInfo = ExternalResources; + remoteGlobalIDString = 42E984F26D5B4ECBE0F0F076; + remoteInfo = Utils; }; - B3BF93B9052C6E5D977B763D /* PBXContainerItemProxy */ = { + BE13815FCA0403A6A9C0D9CD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - B7A58450E8974BF0DDB3874D /* PBXContainerItemProxy */ = { + BE6EDAD5DB3541ECD288BFD9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - BAAECFBDB24D9E22FDDAE7AB /* PBXContainerItemProxy */ = { + D057EED00FD61A095C1D48F2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 42E984F26D5B4ECBE0F0F076; - remoteInfo = Utils; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; + }; + DFB6B3D768109FDA95CBEF01 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; + proxyType = 1; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; + }; + E8637931FCFB4B4D7E33793F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; + proxyType = 1; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; EB2CE0E79F60A8591B178E70 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -187,13 +194,6 @@ remoteGlobalIDString = 9E46111B59CD5CC4865299C2; remoteInfo = Example; }; - FAFC63CF1192A75AB24F3CC0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; - }; FE8CA39EE27D6C96DC480525 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; @@ -685,7 +685,7 @@ buildRules = ( ); dependencies = ( - 479C523BF517576655D49649 /* PBXTargetDependency */, + A96C9B502827029262E8ED8A /* PBXTargetDependency */, ); name = ExampleResources; productName = ExampleResources; @@ -702,7 +702,7 @@ buildRules = ( ); dependencies = ( - D2C66BCC6F0028CB67737692 /* PBXTargetDependency */, + 361C329FFCA21416793E6D21 /* PBXTargetDependency */, ); name = TestingUtils; productName = TestingUtils; @@ -718,7 +718,7 @@ buildRules = ( ); dependencies = ( - 91101406CEC9E21A6B6DA77A /* PBXTargetDependency */, + 3B0633AD84662AEF21C1A5ED /* PBXTargetDependency */, 21FDB4F141406B606E0B74C7 /* PBXTargetDependency */, ); name = Utils; @@ -736,7 +736,7 @@ buildRules = ( ); dependencies = ( - D5BD59BE8BB2DCCFD7B0AFFD /* PBXTargetDependency */, + DF18ECF06C6C7B5E6DE9BD2D /* PBXTargetDependency */, 97533C63F9ED14EA06D9942B /* PBXTargetDependency */, 558E53F433AD3073C54A1F99 /* PBXTargetDependency */, 619B92520AE04DF475C71CE3 /* PBXTargetDependency */, @@ -756,7 +756,7 @@ buildRules = ( ); dependencies = ( - D88707E90E059FB39F3F6680 /* PBXTargetDependency */, + 14E804A128DFD5D70ABAFC40 /* PBXTargetDependency */, EA5A8DB030DD28F2F1A365FE /* PBXTargetDependency */, B8D1904683275B0D2D926E5F /* PBXTargetDependency */, 9F31E9A775F9E479436059E7 /* PBXTargetDependency */, @@ -779,7 +779,7 @@ buildRules = ( ); dependencies = ( - D85FAC7924D560883A5EC96A /* PBXTargetDependency */, + AB1C3081B4C14FDC3D765DFD /* PBXTargetDependency */, 330934BB9FAB5FCD57B18598 /* PBXTargetDependency */, BF0C8F6D0A6CA8F2C761C954 /* PBXTargetDependency */, ); @@ -797,7 +797,7 @@ buildRules = ( ); dependencies = ( - A63D16002E1FCE62ACF9E99D /* PBXTargetDependency */, + 19CC81B1E990D9A4BDFF6293 /* PBXTargetDependency */, ); name = ExternalResources; productName = ExternalResources; @@ -813,7 +813,7 @@ buildRules = ( ); dependencies = ( - D033A41CE5DF3139188DCCCE /* PBXTargetDependency */, + 4E2958552EC93E6809BB7908 /* PBXTargetDependency */, ); name = CoreUtilsObjC; productName = CoreUtilsObjC; @@ -830,7 +830,7 @@ buildRules = ( ); dependencies = ( - 5DDC602419E90C9570AA2AD7 /* PBXTargetDependency */, + FBC2860EC37A52113D12C8E2 /* PBXTargetDependency */, 2D8ED23480A44C6BB910460C /* PBXTargetDependency */, D8395909BBABBF02986121AE /* PBXTargetDependency */, ); @@ -871,9 +871,6 @@ LastSwiftMigration = 1320; TestTargetID = 9E46111B59CD5CC4865299C2; }; - 657E5F38D9811E4DFA49DA75 = { - CreatedOnToolsVersion = 13.2.1; - }; 9E46111B59CD5CC4865299C2 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; @@ -891,6 +888,9 @@ LastSwiftMigration = 1320; TestTargetID = 9E46111B59CD5CC4865299C2; }; + FE59281FE487F27A37DC2EE7 = { + CreatedOnToolsVersion = 13.2.1; + }; }; }; buildConfigurationList = 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */; @@ -907,7 +907,7 @@ projectDirPath = ../..; projectRoot = ""; targets = ( - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */, + FE59281FE487F27A37DC2EE7 /* BazelDependencies */, A0257519AD63A69C6DF51958 /* CoreUtilsObjC */, 9E46111B59CD5CC4865299C2 /* Example */, 4BF4D16D8EFD29114BC29B92 /* ExampleObjcTests.__internal__.__test_bundle */, @@ -998,69 +998,69 @@ shellScript = "cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 14DE13B950F0A4E49F5CF508 /* Copy Files */ = { + 4A203495210B86B9111BD6C9 /* Fix Modulemaps */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "$(INTERNAL_DIR)/generated.xcfilelist", + "$(INTERNAL_DIR)/modulemaps.xcfilelist", ); inputPaths = ( ); - name = "Copy Files"; + name = "Fix Modulemaps"; outputFileListPaths = ( - "$(INTERNAL_DIR)/generated.copied.xcfilelist", + "$(INTERNAL_DIR)/modulemaps.fixed.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; + shellScript = "set -euo pipefail\n\nwhile IFS= read -r input; do\n output=\"${input%.modulemap}.xcode.modulemap\"\n perl -p -e \\\n 's%^(\\s*(\\w+ )?header )(?!(\"\\.\\.(\\/\\.\\.)*\\/|\")(bazel-out|external)\\/)(\"(\\.\\.\\/)*)(.*\")%\\1\\6SRCROOT/\\8%' \\\n < \"$input\" \\\n > \"$output\"\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n"; showEnvVarsInLog = 0; }; - D59B838F58CCDC97935C509C /* Fix Modulemaps */ = { + 773C70B69E7F801B38FDC01C /* Generate Files */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - "$(INTERNAL_DIR)/modulemaps.xcfilelist", - ); inputPaths = ( ); - name = "Fix Modulemaps"; + name = "Generate Files"; outputFileListPaths = ( - "$(INTERNAL_DIR)/modulemaps.fixed.xcfilelist", + "$(INTERNAL_DIR)/external.xcfilelist", + "$(INTERNAL_DIR)/generated.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euo pipefail\n\nwhile IFS= read -r input; do\n output=\"${input%.modulemap}.xcode.modulemap\"\n perl -p -e \\\n 's%^(\\s*(\\w+ )?header )(?!(\"\\.\\.(\\/\\.\\.)*\\/|\")(bazel-out|external)\\/)(\"(\\.\\.\\/)*)(.*\")%\\1\\6SRCROOT/\\8%' \\\n < \"$input\" \\\n > \"$output\"\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n"; + shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n //test/fixtures:fixture_bwx\n"; showEnvVarsInLog = 0; }; - EFD5DC5BF35D589213C98597 /* Generate Files */ = { + 87B0BF431191C40A5DA3740B /* Copy Files */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + "$(INTERNAL_DIR)/generated.xcfilelist", + ); inputPaths = ( ); - name = "Generate Files"; + name = "Copy Files"; outputFileListPaths = ( - "$(INTERNAL_DIR)/external.xcfilelist", - "$(INTERNAL_DIR)/generated.xcfilelist", + "$(INTERNAL_DIR)/generated.copied.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n //test/fixtures:fixture_bwx\n"; + shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; showEnvVarsInLog = 0; }; - FF8B0244BAA1F32D8929C997 /* Fix Info.plists */ = { + A1B677A301B894FBD0B5AB58 /* Fix Info.plists */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1146,6 +1146,18 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 14E804A128DFD5D70ABAFC40 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = BE6EDAD5DB3541ECD288BFD9 /* PBXContainerItemProxy */; + }; + 19CC81B1E990D9A4BDFF6293 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 74B37375F37636668668D9F8 /* PBXContainerItemProxy */; + }; 21FDB4F141406B606E0B74C7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = CoreUtilsObjC; @@ -1164,17 +1176,29 @@ target = 225701F2BB3EA192424F07FE /* ExampleResources */; targetProxy = 6ED91B607D49D808DA25E0DE /* PBXContainerItemProxy */; }; + 361C329FFCA21416793E6D21 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = D057EED00FD61A095C1D48F2 /* PBXContainerItemProxy */; + }; 38158E0F751761A786EB0C75 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Utils; target = 42E984F26D5B4ECBE0F0F076 /* Utils */; targetProxy = BAAECFBDB24D9E22FDDAE7AB /* PBXContainerItemProxy */; }; - 479C523BF517576655D49649 /* PBXTargetDependency */ = { + 3B0633AD84662AEF21C1A5ED /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = E8637931FCFB4B4D7E33793F /* PBXContainerItemProxy */; + }; + 4E2958552EC93E6809BB7908 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = FAFC63CF1192A75AB24F3CC0 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = BE13815FCA0403A6A9C0D9CD /* PBXContainerItemProxy */; }; 558E53F433AD3073C54A1F99 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1182,24 +1206,12 @@ target = 42A7256A505DA3DFEA69C941 /* TestingUtils */; targetProxy = EB2CE0E79F60A8591B178E70 /* PBXContainerItemProxy */; }; - 5DDC602419E90C9570AA2AD7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = B7A58450E8974BF0DDB3874D /* PBXContainerItemProxy */; - }; 619B92520AE04DF475C71CE3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Utils; target = 42E984F26D5B4ECBE0F0F076 /* Utils */; targetProxy = FE8CA39EE27D6C96DC480525 /* PBXContainerItemProxy */; }; - 91101406CEC9E21A6B6DA77A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 8BA5150BAD500ED81E254043 /* PBXContainerItemProxy */; - }; 97533C63F9ED14EA06D9942B /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Example; @@ -1212,11 +1224,17 @@ target = 42A7256A505DA3DFEA69C941 /* TestingUtils */; targetProxy = 174C08D2039C2604CB3A0F76 /* PBXContainerItemProxy */; }; - A63D16002E1FCE62ACF9E99D /* PBXTargetDependency */ = { + A96C9B502827029262E8ED8A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 802904D3BC7B73ACCD2F47BE /* PBXContainerItemProxy */; + }; + AB1C3081B4C14FDC3D765DFD /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = B3BF93B9052C6E5D977B763D /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = DFB6B3D768109FDA95CBEF01 /* PBXContainerItemProxy */; }; B8D1904683275B0D2D926E5F /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1230,41 +1248,17 @@ target = 42E984F26D5B4ECBE0F0F076 /* Utils */; targetProxy = 74D605DCFD345388C0AEF131 /* PBXContainerItemProxy */; }; - D033A41CE5DF3139188DCCCE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 4586EA019F9A0AEB5C3C760A /* PBXContainerItemProxy */; - }; - D2C66BCC6F0028CB67737692 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 6696E8D173BF56A40F4EBFC3 /* PBXContainerItemProxy */; - }; - D5BD59BE8BB2DCCFD7B0AFFD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 5372562177EBC1BD93515F6C /* PBXContainerItemProxy */; - }; D8395909BBABBF02986121AE /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = ExternalResources; target = 9EEE562EF383D06390A55602 /* ExternalResources */; targetProxy = A2202E540FBEDC3B11423E69 /* PBXContainerItemProxy */; }; - D85FAC7924D560883A5EC96A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 55D8683784886A4A2DE0797F /* PBXContainerItemProxy */; - }; - D88707E90E059FB39F3F6680 /* PBXTargetDependency */ = { + DF18ECF06C6C7B5E6DE9BD2D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 9BC443317E7CE097B2BC3F22 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 1BED42F39BAEC2F668EC2467 /* PBXContainerItemProxy */; }; EA5A8DB030DD28F2F1A365FE /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1272,6 +1266,12 @@ target = 9E46111B59CD5CC4865299C2 /* Example */; targetProxy = 8499CD2F34D395AA377AFF38 /* PBXContainerItemProxy */; }; + FBC2860EC37A52113D12C8E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 7234AC8138012B37C733E0DD /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1427,18 +1427,6 @@ }; name = Debug; }; - 3120F32C41840B1165104AAF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - INDEX_FORCE_SCRIPT_EXECUTION = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; 629A27B7ABDA4F965E3952BE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1459,6 +1447,18 @@ }; name = Debug; }; + 67F44AB65FA7A2E38A56F5FB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + INDEX_FORCE_SCRIPT_EXECUTION = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; 7A18C21BB55BC562CF5D419C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1897,14 +1897,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3120F32C41840B1165104AAF /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; 2E81F0BC3C859DAC10F012BE /* Build configuration list for PBXNativeTarget "ExampleTests.__internal__.__test_bundle" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1945,6 +1937,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 67F44AB65FA7A2E38A56F5FB /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; C3D0963743C54453DF36822D /* Build configuration list for PBXNativeTarget "TestingUtils" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/test/fixtures/cc/bwb.xcodeproj/project.pbxproj b/test/fixtures/cc/bwb.xcodeproj/project.pbxproj index 53a1109e2d..02265509d9 100644 --- a/test/fixtures/cc/bwb.xcodeproj/project.pbxproj +++ b/test/fixtures/cc/bwb.xcodeproj/project.pbxproj @@ -7,16 +7,16 @@ objects = { /* Begin PBXAggregateTarget section */ - 9281ECD979418C4678530C3F /* Bazel Dependencies */ = { + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - 2E15CEFF1306DCFD4654C60B /* Bazel Build */, + 9A630CF63C380FAE522825A9 /* Bazel Build */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -44,12 +44,12 @@ remoteGlobalIDString = 373A62571D2CA8826AD4F92C; remoteInfo = "//examples/cc/lib2:lib_impl"; }; - 282F5C276D4DAB386C2899A5 /* PBXContainerItemProxy */ = { + 222EDD9A43AD7060E37D98C1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; 2D50AC8D57F94038C0E530C9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -58,26 +58,26 @@ remoteGlobalIDString = 0CEAA3455274D4DE9B4B82BF; remoteInfo = "@examples_cc_external//:lib_impl"; }; - 616F0B3ABCE95C25B92F1794 /* PBXContainerItemProxy */ = { + 4EE0B41522461A6BD9642C81 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - E349CADD4533360A9E1E5124 /* PBXContainerItemProxy */ = { + B8A90ED069A5C28768A4173B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - EF6C4CA3EF04D54D85A202DF /* PBXContainerItemProxy */ = { + E602DA48799768752E79F6E5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; /* End PBXContainerItemProxy section */ @@ -232,7 +232,7 @@ buildRules = ( ); dependencies = ( - 7CA79F5C774E519C39689DE2 /* PBXTargetDependency */, + 43831FD0645D4D31D8BF9F3C /* PBXTargetDependency */, ); name = "@examples_cc_external//:lib_impl"; productName = lib_impl; @@ -248,7 +248,7 @@ buildRules = ( ); dependencies = ( - BF95D87B4DA9A4D893322682 /* PBXTargetDependency */, + 7176C357250A109C7B9B42E1 /* PBXTargetDependency */, 09E3E376134BB6CCC0CBAD31 /* PBXTargetDependency */, 7B9C45B4ECC722806B78A989 /* PBXTargetDependency */, 5072A54D92BD54F162C06B45 /* PBXTargetDependency */, @@ -267,7 +267,7 @@ buildRules = ( ); dependencies = ( - 2F339B29F8220414A251F19A /* PBXTargetDependency */, + 1312633D03938D4760FD58AE /* PBXTargetDependency */, ); name = "//examples/cc/lib2:lib_impl"; productName = lib_impl; @@ -283,7 +283,7 @@ buildRules = ( ); dependencies = ( - AED5111F50E78199A14249EB /* PBXTargetDependency */, + EA85858C8C7FFB7F3791E220 /* PBXTargetDependency */, ); name = "//examples/cc/lib:lib_impl"; productName = lib_impl; @@ -312,7 +312,7 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; - 9281ECD979418C4678530C3F = { + 7E7D155EBCA520F35DEA3571 = { CreatedOnToolsVersion = 13.2.1; }; E180851AE3E1EEC8C4944F10 = { @@ -334,7 +334,7 @@ projectDirPath = ../../..; projectRoot = ""; targets = ( - 9281ECD979418C4678530C3F /* Bazel Dependencies */, + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */, 0CEAA3455274D4DE9B4B82BF /* @examples_cc_external//:lib_impl */, E180851AE3E1EEC8C4944F10 /* //examples/cc/lib:lib_impl */, 373A62571D2CA8826AD4F92C /* //examples/cc/lib2:lib_impl */, @@ -344,7 +344,7 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 2E15CEFF1306DCFD4654C60B /* Bazel Build */ = { + 9A630CF63C380FAE522825A9 /* Bazel Build */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -409,11 +409,17 @@ target = 0CEAA3455274D4DE9B4B82BF /* @examples_cc_external//:lib_impl */; targetProxy = 2D50AC8D57F94038C0E530C9 /* PBXContainerItemProxy */; }; - 2F339B29F8220414A251F19A /* PBXTargetDependency */ = { + 1312633D03938D4760FD58AE /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 282F5C276D4DAB386C2899A5 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = B8A90ED069A5C28768A4173B /* PBXContainerItemProxy */; + }; + 43831FD0645D4D31D8BF9F3C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 222EDD9A43AD7060E37D98C1 /* PBXContainerItemProxy */; }; 5072A54D92BD54F162C06B45 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -421,29 +427,23 @@ target = 373A62571D2CA8826AD4F92C /* //examples/cc/lib2:lib_impl */; targetProxy = 20B4384B1C553426B14F3544 /* PBXContainerItemProxy */; }; + 7176C357250A109C7B9B42E1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 4EE0B41522461A6BD9642C81 /* PBXContainerItemProxy */; + }; 7B9C45B4ECC722806B78A989 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "//examples/cc/lib:lib_impl"; target = E180851AE3E1EEC8C4944F10 /* //examples/cc/lib:lib_impl */; targetProxy = 1AB65E1F649B115C62DA830F /* PBXContainerItemProxy */; }; - 7CA79F5C774E519C39689DE2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 616F0B3ABCE95C25B92F1794 /* PBXContainerItemProxy */; - }; - AED5111F50E78199A14249EB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = E349CADD4533360A9E1E5124 /* PBXContainerItemProxy */; - }; - BF95D87B4DA9A4D893322682 /* PBXTargetDependency */ = { + EA85858C8C7FFB7F3791E220 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = EF6C4CA3EF04D54D85A202DF /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = E602DA48799768752E79F6E5 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -568,6 +568,18 @@ }; name = Debug; }; + 5AFD85147E5F7EEA259481C2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + INDEX_FORCE_SCRIPT_EXECUTION = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; 6D957D3747854B613BE7F96E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -727,18 +739,6 @@ }; name = Debug; }; - D6C64C86AFDFF55D55C69DFF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - INDEX_FORCE_SCRIPT_EXECUTION = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -766,10 +766,10 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { + 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { isa = XCConfigurationList; buildConfigurations = ( - D6C64C86AFDFF55D55C69DFF /* Debug */, + 5AFD85147E5F7EEA259481C2 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; diff --git a/test/fixtures/cc/bwx.xcodeproj/project.pbxproj b/test/fixtures/cc/bwx.xcodeproj/project.pbxproj index b537124865..d2bd274191 100644 --- a/test/fixtures/cc/bwx.xcodeproj/project.pbxproj +++ b/test/fixtures/cc/bwx.xcodeproj/project.pbxproj @@ -7,16 +7,16 @@ objects = { /* Begin PBXAggregateTarget section */ - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */ = { + FE59281FE487F27A37DC2EE7 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - A82BD2D49506D22549483203 /* Fetch External Repositories */, + 790733B6E675C2785F8020AC /* Fetch External Repositories */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -30,12 +30,12 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 06B9BC89668E20616CD7F364 /* PBXContainerItemProxy */ = { + 42025A1CD8FA6A1FEB112EA2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; 59511478AA09290DC3C73AC2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -44,33 +44,33 @@ remoteGlobalIDString = 9DF8EA4260F38FC7243F6241; remoteInfo = "@examples_cc_external//:lib_impl"; }; - 8698CD4A6028A873CA99945C /* PBXContainerItemProxy */ = { + 8323E2CE960EF05475B43F52 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = BCD9FA95C7CBE2A799AC3DF9; - remoteInfo = "//examples/cc/lib:lib_impl"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - 8BBBD18AF62B7FB2BA7B2553 /* PBXContainerItemProxy */ = { + 8698CD4A6028A873CA99945C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = BCD9FA95C7CBE2A799AC3DF9; + remoteInfo = "//examples/cc/lib:lib_impl"; }; - 8E968503C0D5BE01C052F555 /* PBXContainerItemProxy */ = { + 880FFE0FA4EE63FB2C4847F8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - CA788DF6BBB87BA0F98CE3DD /* PBXContainerItemProxy */ = { + 928A63C7A3B638688471026B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; E2C8E26DA4198C7C2B9239BD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -232,7 +232,7 @@ buildRules = ( ); dependencies = ( - 1A82EA359DDDFD28BD576BEE /* PBXTargetDependency */, + 285FA061754C2107327A45D8 /* PBXTargetDependency */, ); name = "@examples_cc_external//:lib_impl"; productName = lib_impl; @@ -248,7 +248,7 @@ buildRules = ( ); dependencies = ( - 59D0AC2DA4328D2CE5E51ED2 /* PBXTargetDependency */, + 3812C1780716CAECFF2F902E /* PBXTargetDependency */, ); name = "//examples/cc/lib2:lib_impl"; productName = lib_impl; @@ -264,7 +264,7 @@ buildRules = ( ); dependencies = ( - BB8A109CA4B7B9A88E775432 /* PBXTargetDependency */, + 533771049510B162334158B1 /* PBXTargetDependency */, ); name = "//examples/cc/lib:lib_impl"; productName = lib_impl; @@ -280,7 +280,7 @@ buildRules = ( ); dependencies = ( - 10ECF6ABB6A3DA527E8F6091 /* PBXTargetDependency */, + C7CE0C2F304E0B02B1E4E5A4 /* PBXTargetDependency */, 59AC8FC7ED45C65DBD76BA41 /* PBXTargetDependency */, 1122A5CB331663C0EE9EAB7D /* PBXTargetDependency */, 42759F6FCC327FD82603CB04 /* PBXTargetDependency */, @@ -300,9 +300,6 @@ LastSwiftUpdateCheck = 1320; LastUpgradeCheck = 1320; TargetAttributes = { - 657E5F38D9811E4DFA49DA75 = { - CreatedOnToolsVersion = 13.2.1; - }; 9DF8EA4260F38FC7243F6241 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; @@ -319,6 +316,9 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; + FE59281FE487F27A37DC2EE7 = { + CreatedOnToolsVersion = 13.2.1; + }; }; }; buildConfigurationList = 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */; @@ -334,7 +334,7 @@ projectDirPath = ../../..; projectRoot = ""; targets = ( - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */, + FE59281FE487F27A37DC2EE7 /* BazelDependencies */, 9DF8EA4260F38FC7243F6241 /* @examples_cc_external//:lib_impl */, BCD9FA95C7CBE2A799AC3DF9 /* //examples/cc/lib:lib_impl */, B2EDA6BA27C01B7B8423DADB /* //examples/cc/lib2:lib_impl */, @@ -344,7 +344,7 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - A82BD2D49506D22549483203 /* Fetch External Repositories */ = { + 790733B6E675C2785F8020AC /* Fetch External Repositories */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -403,23 +403,23 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 10ECF6ABB6A3DA527E8F6091 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 8BBBD18AF62B7FB2BA7B2553 /* PBXContainerItemProxy */; - }; 1122A5CB331663C0EE9EAB7D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "//examples/cc/lib:lib_impl"; target = BCD9FA95C7CBE2A799AC3DF9 /* //examples/cc/lib:lib_impl */; targetProxy = 8698CD4A6028A873CA99945C /* PBXContainerItemProxy */; }; - 1A82EA359DDDFD28BD576BEE /* PBXTargetDependency */ = { + 285FA061754C2107327A45D8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 42025A1CD8FA6A1FEB112EA2 /* PBXContainerItemProxy */; + }; + 3812C1780716CAECFF2F902E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = CA788DF6BBB87BA0F98CE3DD /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 928A63C7A3B638688471026B /* PBXContainerItemProxy */; }; 42759F6FCC327FD82603CB04 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -427,39 +427,27 @@ target = B2EDA6BA27C01B7B8423DADB /* //examples/cc/lib2:lib_impl */; targetProxy = E2C8E26DA4198C7C2B9239BD /* PBXContainerItemProxy */; }; + 533771049510B162334158B1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 8323E2CE960EF05475B43F52 /* PBXContainerItemProxy */; + }; 59AC8FC7ED45C65DBD76BA41 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "@examples_cc_external//:lib_impl"; target = 9DF8EA4260F38FC7243F6241 /* @examples_cc_external//:lib_impl */; targetProxy = 59511478AA09290DC3C73AC2 /* PBXContainerItemProxy */; }; - 59D0AC2DA4328D2CE5E51ED2 /* PBXTargetDependency */ = { + C7CE0C2F304E0B02B1E4E5A4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 8E968503C0D5BE01C052F555 /* PBXContainerItemProxy */; - }; - BB8A109CA4B7B9A88E775432 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 06B9BC89668E20616CD7F364 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 880FFE0FA4EE63FB2C4847F8 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 3120F32C41840B1165104AAF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - INDEX_FORCE_SCRIPT_EXECUTION = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; 3C4E7D66EF31F8A2E1312361 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -519,6 +507,18 @@ }; name = Debug; }; + 67F44AB65FA7A2E38A56F5FB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + INDEX_FORCE_SCRIPT_EXECUTION = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; C221D886D6D02D33114D3473 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -736,14 +736,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3120F32C41840B1165104AAF /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; 1DD860963E9CFCDCE0CE985C /* Build configuration list for PBXNativeTarget "//examples/cc/lib2:lib_impl" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -776,6 +768,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 67F44AB65FA7A2E38A56F5FB /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; FA7CA526EED1582756E3E941 /* Build configuration list for PBXNativeTarget "@examples_cc_external//:lib_impl" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/test/fixtures/command_line/bwb.xcodeproj/project.pbxproj b/test/fixtures/command_line/bwb.xcodeproj/project.pbxproj index 8b9777696d..f968c401f8 100644 --- a/test/fixtures/command_line/bwb.xcodeproj/project.pbxproj +++ b/test/fixtures/command_line/bwb.xcodeproj/project.pbxproj @@ -7,19 +7,19 @@ objects = { /* Begin PBXAggregateTarget section */ - 9281ECD979418C4678530C3F /* Bazel Dependencies */ = { + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - 2E15CEFF1306DCFD4654C60B /* Bazel Build */, - 391E7CA7B16FAFAE0457D1C2 /* Copy Files */, - 77D46E44C108C6CEE2F89E0D /* Fix Modulemaps */, - 4CBF24D403529E7553176153 /* Fix Info.plists */, + 9A630CF63C380FAE522825A9 /* Bazel Build */, + CF398643BE2886B2AAE69745 /* Copy Files */, + FF28C25A21C1530CA1AF5318 /* Fix Modulemaps */, + FC6E45C2D1E2FBCFC2D1471E /* Fix Info.plists */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -40,61 +40,61 @@ remoteGlobalIDString = BC691472A2BC47F8E1D5D637; remoteInfo = lib_impl; }; - 49BDB6255162C6878FFC3286 /* PBXContainerItemProxy */ = { + 2FC9D90BBC92B51DCC9FDAD6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - 4FCA719D687A009B4B372BFA /* PBXContainerItemProxy */ = { + 4E427150188B59D55AA8579B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - 941CFFB87F4F5822EFA8B01D /* PBXContainerItemProxy */ = { + 4EE0B41522461A6BD9642C81 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 8E3B6C47A6106921076BC573; - remoteInfo = lib_swift; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - B72B5A378909AA34EF448E32 /* PBXContainerItemProxy */ = { + 70875BE59399E24155D8BE76 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = EAFF1E96A87B75E6BA080719; - remoteInfo = private_lib; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - C0AE6AA9FC08390DB1932DDD /* PBXContainerItemProxy */ = { + 7FFB42E8194119A9015D30B8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 8E3B6C47A6106921076BC573; - remoteInfo = lib_swift; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - C8155DB861760DF4B9F086CC /* PBXContainerItemProxy */ = { + 941CFFB87F4F5822EFA8B01D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 8E3B6C47A6106921076BC573; + remoteInfo = lib_swift; }; - E84F3D37FC9B7386169F9A20 /* PBXContainerItemProxy */ = { + B72B5A378909AA34EF448E32 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = EAFF1E96A87B75E6BA080719; + remoteInfo = private_lib; }; - EF6C4CA3EF04D54D85A202DF /* PBXContainerItemProxy */ = { + C0AE6AA9FC08390DB1932DDD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 8E3B6C47A6106921076BC573; + remoteInfo = lib_swift; }; /* End PBXContainerItemProxy section */ @@ -358,7 +358,7 @@ buildRules = ( ); dependencies = ( - BF95D87B4DA9A4D893322682 /* PBXTargetDependency */, + 7176C357250A109C7B9B42E1 /* PBXTargetDependency */, 0264408EBC1B158ADC203602 /* PBXTargetDependency */, ); name = tool; @@ -376,7 +376,7 @@ buildRules = ( ); dependencies = ( - F8E77B03B350308E332E8543 /* PBXTargetDependency */, + 1BB14BD319203CF277CB7228 /* PBXTargetDependency */, 2BC4078E4942848FB045F836 /* PBXTargetDependency */, 48E90D683A23B2E53782AC0A /* PBXTargetDependency */, ); @@ -394,7 +394,7 @@ buildRules = ( ); dependencies = ( - 7CC9669C82B829743EB97628 /* PBXTargetDependency */, + D96519F774F29A2A95CA6327 /* PBXTargetDependency */, ); name = lib_impl; productName = lib_impl; @@ -410,7 +410,7 @@ buildRules = ( ); dependencies = ( - E291B87B53A3A7A89DB5D119 /* PBXTargetDependency */, + B9C9FDEED488D7E33209540A /* PBXTargetDependency */, 2CF2586B0B0366E350C5E6BF /* PBXTargetDependency */, ); name = LibSwiftTests.__internal__.__test_bundle; @@ -427,7 +427,7 @@ buildRules = ( ); dependencies = ( - 14D809DC7E57C3F83E83BBA9 /* PBXTargetDependency */, + 4D5BDBE2087421AB8DBA35E9 /* PBXTargetDependency */, ); name = private_lib; productName = private_lib; @@ -448,12 +448,12 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; - 8E3B6C47A6106921076BC573 = { + 7E7D155EBCA520F35DEA3571 = { CreatedOnToolsVersion = 13.2.1; - LastSwiftMigration = 1320; }; - 9281ECD979418C4678530C3F = { + 8E3B6C47A6106921076BC573 = { CreatedOnToolsVersion = 13.2.1; + LastSwiftMigration = 1320; }; BC691472A2BC47F8E1D5D637 = { CreatedOnToolsVersion = 13.2.1; @@ -482,7 +482,7 @@ projectDirPath = ../../..; projectRoot = ""; targets = ( - 9281ECD979418C4678530C3F /* Bazel Dependencies */, + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */, BC691472A2BC47F8E1D5D637 /* lib_impl */, 8E3B6C47A6106921076BC573 /* lib_swift */, E56E8F91E4327755D5B09E30 /* LibSwiftTests.__internal__.__test_bundle */, @@ -493,7 +493,24 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 2E15CEFF1306DCFD4654C60B /* Bazel Build */ = { + 7D1C1AFB1B1C40174C24CF23 /* Copy Swift Generated Header */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(DERIVED_FILE_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", + ); + name = "Copy Swift Generated Header"; + outputPaths = ( + "$(CONFIGURATION_BUILD_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 9A630CF63C380FAE522825A9 /* Bazel Build */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -513,7 +530,7 @@ shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n if [[ -f \"$HOME/.lldbinit\" ]]; then\n home_init=\"command source ~/.lldbinit\n\n \"\n else\n home_init=\"\"\n fi\n\n cat < \"$BAZEL_LLDB_INIT\"\n$home_init\\\n# Set \\`CWD\\` to \\`\\$SRCROOT\\` so relative paths in binaries work\nplatform settings -w \"$SRCROOT\"\n\n# \"Undo\" \\`-debug-prefix-map\\`\nsettings set target.source-map ./external/ \"$external\"\nsettings append target.source-map ./ \"$SRCROOT\"\nEOF\nfi\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\noutput_groups=()\nif [ -s \"$BAZEL_BUILD_OUTPUT_GROUPS_FILE\" ]; then\n while IFS= read -r output_group; do\n output_groups+=(\"--output_groups=+$output_group\")\n done < \"$BAZEL_BUILD_OUTPUT_GROUPS_FILE\"\nfi\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n ${output_groups[@]+\"${output_groups[@]}\"} \\\n //test/fixtures/command_line:xcodeproj_bwb\n"; showEnvVarsInLog = 0; }; - 391E7CA7B16FAFAE0457D1C2 /* Copy Files */ = { + CF398643BE2886B2AAE69745 /* Copy Files */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -534,7 +551,7 @@ shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; showEnvVarsInLog = 0; }; - 4CBF24D403529E7553176153 /* Fix Info.plists */ = { + FC6E45C2D1E2FBCFC2D1471E /* Fix Info.plists */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -555,7 +572,7 @@ shellScript = "set -euo pipefail\n\nwhile IFS= read -r input; do\n output=\"${input%.plist}.xcode.plist\"\n cp \"$input\" \"$output\"\n plutil -remove UIDeviceFamily \"$output\" || true\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n"; showEnvVarsInLog = 0; }; - 77D46E44C108C6CEE2F89E0D /* Fix Modulemaps */ = { + FF28C25A21C1530CA1AF5318 /* Fix Modulemaps */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -576,23 +593,6 @@ shellScript = "set -euo pipefail\n\nwhile IFS= read -r input; do\n output=\"${input%.modulemap}.xcode.modulemap\"\n perl -p -e \\\n 's%^(\\s*(\\w+ )?header )(?!(\"\\.\\.(\\/\\.\\.)*\\/|\")(bazel-out|external)\\/)(\"(\\.\\.\\/)*)(.*\")%\\1\\6SRCROOT/\\8%' \\\n < \"$input\" \\\n > \"$output\"\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n"; showEnvVarsInLog = 0; }; - 7D1C1AFB1B1C40174C24CF23 /* Copy Swift Generated Header */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(DERIVED_FILE_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", - ); - name = "Copy Swift Generated Header"; - outputPaths = ( - "$(CONFIGURATION_BUILD_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -646,11 +646,11 @@ target = 8E3B6C47A6106921076BC573 /* lib_swift */; targetProxy = 941CFFB87F4F5822EFA8B01D /* PBXContainerItemProxy */; }; - 14D809DC7E57C3F83E83BBA9 /* PBXTargetDependency */ = { + 1BB14BD319203CF277CB7228 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 4FCA719D687A009B4B372BFA /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 70875BE59399E24155D8BE76 /* PBXContainerItemProxy */; }; 2BC4078E4942848FB045F836 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -670,29 +670,29 @@ target = EAFF1E96A87B75E6BA080719 /* private_lib */; targetProxy = B72B5A378909AA34EF448E32 /* PBXContainerItemProxy */; }; - 7CC9669C82B829743EB97628 /* PBXTargetDependency */ = { + 4D5BDBE2087421AB8DBA35E9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = E84F3D37FC9B7386169F9A20 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 7FFB42E8194119A9015D30B8 /* PBXContainerItemProxy */; }; - BF95D87B4DA9A4D893322682 /* PBXTargetDependency */ = { + 7176C357250A109C7B9B42E1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = EF6C4CA3EF04D54D85A202DF /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 4EE0B41522461A6BD9642C81 /* PBXContainerItemProxy */; }; - E291B87B53A3A7A89DB5D119 /* PBXTargetDependency */ = { + B9C9FDEED488D7E33209540A /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = C8155DB861760DF4B9F086CC /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 4E427150188B59D55AA8579B /* PBXContainerItemProxy */; }; - F8E77B03B350308E332E8543 /* PBXTargetDependency */ = { + D96519F774F29A2A95CA6327 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 49BDB6255162C6878FFC3286 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 2FC9D90BBC92B51DCC9FDAD6 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -758,6 +758,18 @@ }; name = Debug; }; + 5AFD85147E5F7EEA259481C2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + INDEX_FORCE_SCRIPT_EXECUTION = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; 5D95C37273FAF8FEAFAE2065 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -984,18 +996,6 @@ }; name = Debug; }; - D6C64C86AFDFF55D55C69DFF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - INDEX_FORCE_SCRIPT_EXECUTION = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; E12C67A19F1823D48F4CCC14 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1086,18 +1086,18 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - AD3F4F785C55BC22954599FC /* Build configuration list for PBXNativeTarget "private_lib" */ = { + 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { isa = XCConfigurationList; buildConfigurations = ( - E12C67A19F1823D48F4CCC14 /* Debug */, + 5AFD85147E5F7EEA259481C2 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { + AD3F4F785C55BC22954599FC /* Build configuration list for PBXNativeTarget "private_lib" */ = { isa = XCConfigurationList; buildConfigurations = ( - D6C64C86AFDFF55D55C69DFF /* Debug */, + E12C67A19F1823D48F4CCC14 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; diff --git a/test/fixtures/command_line/bwx.xcodeproj/project.pbxproj b/test/fixtures/command_line/bwx.xcodeproj/project.pbxproj index 19e1c3d753..923648176b 100644 --- a/test/fixtures/command_line/bwx.xcodeproj/project.pbxproj +++ b/test/fixtures/command_line/bwx.xcodeproj/project.pbxproj @@ -7,19 +7,19 @@ objects = { /* Begin PBXAggregateTarget section */ - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */ = { + FE59281FE487F27A37DC2EE7 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - EFD5DC5BF35D589213C98597 /* Generate Files */, - 14DE13B950F0A4E49F5CF508 /* Copy Files */, - D59B838F58CCDC97935C509C /* Fix Modulemaps */, - FF8B0244BAA1F32D8929C997 /* Fix Info.plists */, + 773C70B69E7F801B38FDC01C /* Generate Files */, + 87B0BF431191C40A5DA3740B /* Copy Files */, + 4A203495210B86B9111BD6C9 /* Fix Modulemaps */, + A1B677A301B894FBD0B5AB58 /* Fix Info.plists */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -40,12 +40,12 @@ remoteGlobalIDString = 195FCD65F4EB377830E3E996; remoteInfo = lib_swift; }; - 5EC24FA64469EE293D7EC05E /* PBXContainerItemProxy */ = { + 28A83CBB86EF28A90A42A515 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; 653BE8483F924022BD246430 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -54,26 +54,19 @@ remoteGlobalIDString = BB180DABF9AB371C353A7F0D; remoteInfo = private_lib; }; - 8BBBD18AF62B7FB2BA7B2553 /* PBXContainerItemProxy */ = { + 880FFE0FA4EE63FB2C4847F8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - B0C48A885AAB4B338F5457ED /* PBXContainerItemProxy */ = { + B1E5509E710AAD34090DD08E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; - }; - BD9A874E2F6E38703790C461 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; CA9CDA938E8AE3259FBC42DC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -89,12 +82,19 @@ remoteGlobalIDString = 195FCD65F4EB377830E3E996; remoteInfo = lib_swift; }; - EE89CCA5CCF1C26DAA0505EA /* PBXContainerItemProxy */ = { + E5AFE3202D2F8EA04418A11D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; + proxyType = 1; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; + }; + E6F5CC6545521EF4DBAE3D15 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; /* End PBXContainerItemProxy section */ @@ -358,7 +358,7 @@ buildRules = ( ); dependencies = ( - D83476C7D73E68CF9961DDAE /* PBXTargetDependency */, + BA7B64071823CA6AE12BC51B /* PBXTargetDependency */, 1945C34941723F46B78E9D8D /* PBXTargetDependency */, ); name = LibSwiftTests.__internal__.__test_bundle; @@ -376,7 +376,7 @@ buildRules = ( ); dependencies = ( - 085D63D0B3A87638171583ED /* PBXTargetDependency */, + 649D6CCAD3B2D370364F2085 /* PBXTargetDependency */, 5788E50D72472F75EFAA6061 /* PBXTargetDependency */, 912FBD722EA10EF086198A14 /* PBXTargetDependency */, ); @@ -394,7 +394,7 @@ buildRules = ( ); dependencies = ( - 3BEEB43740C27C0D0C69F2D0 /* PBXTargetDependency */, + 88BD90568A1ED6147322E6D1 /* PBXTargetDependency */, ); name = lib_impl; productName = lib_impl; @@ -410,7 +410,7 @@ buildRules = ( ); dependencies = ( - FA7322CDCDE66B2E4F06D9AA /* PBXTargetDependency */, + CB011C7AF72C27E1ECA48047 /* PBXTargetDependency */, ); name = private_lib; productName = private_lib; @@ -426,7 +426,7 @@ buildRules = ( ); dependencies = ( - 10ECF6ABB6A3DA527E8F6091 /* PBXTargetDependency */, + C7CE0C2F304E0B02B1E4E5A4 /* PBXTargetDependency */, 204A0BCF0B6A0D2D142BCA76 /* PBXTargetDependency */, ); name = tool; @@ -452,9 +452,6 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; - 657E5F38D9811E4DFA49DA75 = { - CreatedOnToolsVersion = 13.2.1; - }; 8329F08BE01D4CC32B819CE9 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; @@ -467,6 +464,9 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; + FE59281FE487F27A37DC2EE7 = { + CreatedOnToolsVersion = 13.2.1; + }; }; }; buildConfigurationList = 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */; @@ -482,7 +482,7 @@ projectDirPath = ../../..; projectRoot = ""; targets = ( - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */, + FE59281FE487F27A37DC2EE7 /* BazelDependencies */, 8329F08BE01D4CC32B819CE9 /* lib_impl */, 195FCD65F4EB377830E3E996 /* lib_swift */, 0290E727C546D76C651A3B2D /* LibSwiftTests.__internal__.__test_bundle */, @@ -493,86 +493,86 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 14DE13B950F0A4E49F5CF508 /* Copy Files */ = { + 4A203495210B86B9111BD6C9 /* Fix Modulemaps */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "$(INTERNAL_DIR)/generated.xcfilelist", + "$(INTERNAL_DIR)/modulemaps.xcfilelist", ); inputPaths = ( ); - name = "Copy Files"; + name = "Fix Modulemaps"; outputFileListPaths = ( - "$(INTERNAL_DIR)/generated.copied.xcfilelist", + "$(INTERNAL_DIR)/modulemaps.fixed.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; + shellScript = "set -euo pipefail\n\nwhile IFS= read -r input; do\n output=\"${input%.modulemap}.xcode.modulemap\"\n perl -p -e \\\n 's%^(\\s*(\\w+ )?header )(?!(\"\\.\\.(\\/\\.\\.)*\\/|\")(bazel-out|external)\\/)(\"(\\.\\.\\/)*)(.*\")%\\1\\6SRCROOT/\\8%' \\\n < \"$input\" \\\n > \"$output\"\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n"; showEnvVarsInLog = 0; }; - 88F7F6781328CA74DCF58611 /* Copy Swift Generated Header */ = { + 773C70B69E7F801B38FDC01C /* Generate Files */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "$(DERIVED_FILE_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", ); - name = "Copy Swift Generated Header"; + name = "Generate Files"; + outputFileListPaths = ( + "$(INTERNAL_DIR)/external.xcfilelist", + "$(INTERNAL_DIR)/generated.xcfilelist", + ); outputPaths = ( - "$(CONFIGURATION_BUILD_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n //test/fixtures/command_line:xcodeproj_bwx\n"; showEnvVarsInLog = 0; }; - D59B838F58CCDC97935C509C /* Fix Modulemaps */ = { + 87B0BF431191C40A5DA3740B /* Copy Files */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "$(INTERNAL_DIR)/modulemaps.xcfilelist", + "$(INTERNAL_DIR)/generated.xcfilelist", ); inputPaths = ( ); - name = "Fix Modulemaps"; + name = "Copy Files"; outputFileListPaths = ( - "$(INTERNAL_DIR)/modulemaps.fixed.xcfilelist", + "$(INTERNAL_DIR)/generated.copied.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euo pipefail\n\nwhile IFS= read -r input; do\n output=\"${input%.modulemap}.xcode.modulemap\"\n perl -p -e \\\n 's%^(\\s*(\\w+ )?header )(?!(\"\\.\\.(\\/\\.\\.)*\\/|\")(bazel-out|external)\\/)(\"(\\.\\.\\/)*)(.*\")%\\1\\6SRCROOT/\\8%' \\\n < \"$input\" \\\n > \"$output\"\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n"; + shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; showEnvVarsInLog = 0; }; - EFD5DC5BF35D589213C98597 /* Generate Files */ = { + 88F7F6781328CA74DCF58611 /* Copy Swift Generated Header */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "$(DERIVED_FILE_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", ); - name = "Generate Files"; - outputFileListPaths = ( - "$(INTERNAL_DIR)/external.xcfilelist", - "$(INTERNAL_DIR)/generated.xcfilelist", - ); + name = "Copy Swift Generated Header"; outputPaths = ( + "$(CONFIGURATION_BUILD_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n //test/fixtures/command_line:xcodeproj_bwx\n"; + shellScript = "cp \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - FF8B0244BAA1F32D8929C997 /* Fix Info.plists */ = { + A1B677A301B894FBD0B5AB58 /* Fix Info.plists */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -640,18 +640,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 085D63D0B3A87638171583ED /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = BD9A874E2F6E38703790C461 /* PBXContainerItemProxy */; - }; - 10ECF6ABB6A3DA527E8F6091 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 8BBBD18AF62B7FB2BA7B2553 /* PBXContainerItemProxy */; - }; 1945C34941723F46B78E9D8D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = lib_swift; @@ -664,40 +652,52 @@ target = 195FCD65F4EB377830E3E996 /* lib_swift */; targetProxy = CEF33237E121C8902D54BB86 /* PBXContainerItemProxy */; }; - 3BEEB43740C27C0D0C69F2D0 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = EE89CCA5CCF1C26DAA0505EA /* PBXContainerItemProxy */; - }; 5788E50D72472F75EFAA6061 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = lib_impl; target = 8329F08BE01D4CC32B819CE9 /* lib_impl */; targetProxy = CA9CDA938E8AE3259FBC42DC /* PBXContainerItemProxy */; }; + 649D6CCAD3B2D370364F2085 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = E5AFE3202D2F8EA04418A11D /* PBXContainerItemProxy */; + }; + 88BD90568A1ED6147322E6D1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = B1E5509E710AAD34090DD08E /* PBXContainerItemProxy */; + }; 912FBD722EA10EF086198A14 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = private_lib; target = BB180DABF9AB371C353A7F0D /* private_lib */; targetProxy = 653BE8483F924022BD246430 /* PBXContainerItemProxy */; }; - D83476C7D73E68CF9961DDAE /* PBXTargetDependency */ = { + BA7B64071823CA6AE12BC51B /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = B0C48A885AAB4B338F5457ED /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 28A83CBB86EF28A90A42A515 /* PBXContainerItemProxy */; }; - FA7322CDCDE66B2E4F06D9AA /* PBXTargetDependency */ = { + C7CE0C2F304E0B02B1E4E5A4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 5EC24FA64469EE293D7EC05E /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 880FFE0FA4EE63FB2C4847F8 /* PBXContainerItemProxy */; + }; + CB011C7AF72C27E1ECA48047 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = E6F5CC6545521EF4DBAE3D15 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 3120F32C41840B1165104AAF /* Debug */ = { + 67F44AB65FA7A2E38A56F5FB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; @@ -1047,14 +1047,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3120F32C41840B1165104AAF /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; 25505A4CBF68C981D5D1CAD4 /* Build configuration list for PBXNativeTarget "private_lib" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1087,6 +1079,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 67F44AB65FA7A2E38A56F5FB /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; E6E0D091E6E3BCB59D6F75D5 /* Build configuration list for PBXNativeTarget "lib_swift" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/test/fixtures/generator/bwb.xcodeproj/project.pbxproj b/test/fixtures/generator/bwb.xcodeproj/project.pbxproj index e211c776bc..e50610890a 100644 --- a/test/fixtures/generator/bwb.xcodeproj/project.pbxproj +++ b/test/fixtures/generator/bwb.xcodeproj/project.pbxproj @@ -7,16 +7,16 @@ objects = { /* Begin PBXAggregateTarget section */ - 9281ECD979418C4678530C3F /* Bazel Dependencies */ = { + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - 2E15CEFF1306DCFD4654C60B /* Bazel Build */, + 9A630CF63C380FAE522825A9 /* Bazel Build */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -258,19 +258,12 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 0879335532B98E33BF6BF4C4 /* PBXContainerItemProxy */ = { + 1B37F14BCD93FD7AB94FD7E0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; - }; - 173D3837CC2355C09B4722CF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0805833D09730531AD081697 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; 201DCF3149264E9D8AB4CA97 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -286,13 +279,6 @@ remoteGlobalIDString = F12050E30563A81EEBB2EA9B; remoteInfo = generator.library; }; - 293F186D89C78567377B1C93 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0805833D09730531AD081697 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; - }; 2C860512D9D794C14E15BE5B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; @@ -314,47 +300,54 @@ remoteGlobalIDString = 302F4C6E9EE3F09D4809EF0A; remoteInfo = CustomDump; }; - 4AA42476D09CFFBF85E02DCA /* PBXContainerItemProxy */ = { + 5860D57390AE14C57D4A302E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 886150B3C63D0DBEF9BB4E6B; + remoteInfo = AEXML; }; - 5860D57390AE14C57D4A302E /* PBXContainerItemProxy */ = { + 5DC7EE59040383A84FE9D924 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 886150B3C63D0DBEF9BB4E6B; - remoteInfo = AEXML; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - 60AF15424D1FAF71C6054523 /* PBXContainerItemProxy */ = { + 6BA13D7167A2D734540FB39B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - B6A85EF1D3CC21D987016204 /* PBXContainerItemProxy */ = { + 8F6708A57B268EEC25458F4B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - BCBF87D30139B74A2F0EAE5F /* PBXContainerItemProxy */ = { + 9C160353EC1D44BF4328F010 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - C0E3B30F79F9DE5C9B5640E9 /* PBXContainerItemProxy */ = { + CB296530EA22D256448D26E6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; + }; + CB31E5DA752D8750D1B12D6D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0805833D09730531AD081697 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; CD181E6AF3DFD2EF12094EE5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -370,19 +363,26 @@ remoteGlobalIDString = F12050E30563A81EEBB2EA9B; remoteInfo = generator.library; }; - D157564C43F0EE22553BDD68 /* PBXContainerItemProxy */ = { + D5437FAEB47AEF0B67E5BB23 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 023B2C041CD79AF5B2FDAFE1; + remoteInfo = OrderedCollections; }; - D5437FAEB47AEF0B67E5BB23 /* PBXContainerItemProxy */ = { + D8B8700D5948E731503D5220 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 023B2C041CD79AF5B2FDAFE1; - remoteInfo = OrderedCollections; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; + }; + EDEE3873CD6E83B2191E0B52 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0805833D09730531AD081697 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; /* End PBXContainerItemProxy section */ @@ -1268,7 +1268,7 @@ buildRules = ( ); dependencies = ( - E77B703B4797C35DAC0A2760 /* PBXTargetDependency */, + 77B8BAE8D4D903333ACE2953 /* PBXTargetDependency */, ); name = OrderedCollections; productName = OrderedCollections; @@ -1284,7 +1284,7 @@ buildRules = ( ); dependencies = ( - E70EB53C035C7420B9C7B634 /* PBXTargetDependency */, + 8BD8BF72DDF6DD3B9C03753E /* PBXTargetDependency */, 94E1DFA69955CA57806ABE25 /* PBXTargetDependency */, ); name = CustomDump; @@ -1301,7 +1301,7 @@ buildRules = ( ); dependencies = ( - 1A8365E344501BAFDAEF1807 /* PBXTargetDependency */, + E018DF11F7B6F56C49542FBE /* PBXTargetDependency */, ); name = PathKit; productName = PathKit; @@ -1317,7 +1317,7 @@ buildRules = ( ); dependencies = ( - B008392B21E0873350179B5E /* PBXTargetDependency */, + F95C6EAD9F7184C6730E9F61 /* PBXTargetDependency */, C0C4842B0D633EDDA463F849 /* PBXTargetDependency */, ); name = generator; @@ -1334,7 +1334,7 @@ buildRules = ( ); dependencies = ( - 6D01FFE986A0ADC6196F2BBA /* PBXTargetDependency */, + F549E104AB686D4C3383DB6E /* PBXTargetDependency */, ); name = AEXML; productName = AEXML; @@ -1350,7 +1350,7 @@ buildRules = ( ); dependencies = ( - 8846CB4833983D95814168A2 /* PBXTargetDependency */, + 02991226505D2F59EC54038D /* PBXTargetDependency */, 272FB95BF351D18E24AF12EE /* PBXTargetDependency */, 3880438A5A38C4F764B735E5 /* PBXTargetDependency */, ); @@ -1368,7 +1368,7 @@ buildRules = ( ); dependencies = ( - E05837FCBD9C29411453F840 /* PBXTargetDependency */, + 248C27B8CD62810B45507CD6 /* PBXTargetDependency */, ); name = XCTestDynamicOverlay; productName = XCTestDynamicOverlay; @@ -1384,7 +1384,7 @@ buildRules = ( ); dependencies = ( - 19D99A91C72B04EDE5327CBF /* PBXTargetDependency */, + 49193367A3BB0A1F434F8451 /* PBXTargetDependency */, 15C9D6D9FFC25DEDBF1B4FB1 /* PBXTargetDependency */, 2A18DCEDD62C0092B4434B53 /* PBXTargetDependency */, ); @@ -1402,7 +1402,7 @@ buildRules = ( ); dependencies = ( - 85A82591E91C64E1BE8A1302 /* PBXTargetDependency */, + 3EA0C83A14495EFAB70B41B5 /* PBXTargetDependency */, C30AA64369888C8FA44AC46B /* PBXTargetDependency */, 3C87B52A50F5CA5CA4F4127C /* PBXTargetDependency */, 89785168DF6A2CA38BEB0A0C /* PBXTargetDependency */, @@ -1434,6 +1434,9 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; + 7E7D155EBCA520F35DEA3571 = { + CreatedOnToolsVersion = 13.2.1; + }; 85C876DB90D51CD225023BB2 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; @@ -1442,9 +1445,6 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; - 9281ECD979418C4678530C3F = { - CreatedOnToolsVersion = 13.2.1; - }; 979D12680661F4B864602CE6 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; @@ -1476,7 +1476,7 @@ projectDirPath = ../../..; projectRoot = ""; targets = ( - 9281ECD979418C4678530C3F /* Bazel Dependencies */, + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */, 886150B3C63D0DBEF9BB4E6B /* AEXML */, 302F4C6E9EE3F09D4809EF0A /* CustomDump */, 85C876DB90D51CD225023BB2 /* generator */, @@ -1491,7 +1491,7 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 2E15CEFF1306DCFD4654C60B /* Bazel Build */ = { + 9A630CF63C380FAE522825A9 /* Bazel Build */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -1813,23 +1813,23 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 02991226505D2F59EC54038D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 1B37F14BCD93FD7AB94FD7E0 /* PBXContainerItemProxy */; + }; 15C9D6D9FFC25DEDBF1B4FB1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = AEXML; target = 886150B3C63D0DBEF9BB4E6B /* AEXML */; targetProxy = 5860D57390AE14C57D4A302E /* PBXContainerItemProxy */; }; - 19D99A91C72B04EDE5327CBF /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = C0E3B30F79F9DE5C9B5640E9 /* PBXContainerItemProxy */; - }; - 1A8365E344501BAFDAEF1807 /* PBXTargetDependency */ = { + 248C27B8CD62810B45507CD6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 0879335532B98E33BF6BF4C4 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 6BA13D7167A2D734540FB39B /* PBXContainerItemProxy */; }; 272FB95BF351D18E24AF12EE /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1855,23 +1855,23 @@ target = 4A2EC1B2D6969F717CB890DE /* PathKit */; targetProxy = 201DCF3149264E9D8AB4CA97 /* PBXContainerItemProxy */; }; - 6D01FFE986A0ADC6196F2BBA /* PBXTargetDependency */ = { + 3EA0C83A14495EFAB70B41B5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 293F186D89C78567377B1C93 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = CB296530EA22D256448D26E6 /* PBXContainerItemProxy */; }; - 85A82591E91C64E1BE8A1302 /* PBXTargetDependency */ = { + 49193367A3BB0A1F434F8451 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = BCBF87D30139B74A2F0EAE5F /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 8F6708A57B268EEC25458F4B /* PBXContainerItemProxy */; }; - 8846CB4833983D95814168A2 /* PBXTargetDependency */ = { + 77B8BAE8D4D903333ACE2953 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 60AF15424D1FAF71C6054523 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = EDEE3873CD6E83B2191E0B52 /* PBXContainerItemProxy */; }; 89785168DF6A2CA38BEB0A0C /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1879,18 +1879,18 @@ target = A09CE18EBBDAC65CD0C6B7D1 /* XcodeProj */; targetProxy = 2C860512D9D794C14E15BE5B /* PBXContainerItemProxy */; }; + 8BD8BF72DDF6DD3B9C03753E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = CB31E5DA752D8750D1B12D6D /* PBXContainerItemProxy */; + }; 94E1DFA69955CA57806ABE25 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = XCTestDynamicOverlay; target = 9DF90F35406923EA23C68CFC /* XCTestDynamicOverlay */; targetProxy = 34739E478519DAF595040254 /* PBXContainerItemProxy */; }; - B008392B21E0873350179B5E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 173D3837CC2355C09B4722CF /* PBXContainerItemProxy */; - }; C0C4842B0D633EDDA463F849 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = generator.library; @@ -1903,23 +1903,23 @@ target = 023B2C041CD79AF5B2FDAFE1 /* OrderedCollections */; targetProxy = D5437FAEB47AEF0B67E5BB23 /* PBXContainerItemProxy */; }; - E05837FCBD9C29411453F840 /* PBXTargetDependency */ = { + E018DF11F7B6F56C49542FBE /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 4AA42476D09CFFBF85E02DCA /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 9C160353EC1D44BF4328F010 /* PBXContainerItemProxy */; }; - E70EB53C035C7420B9C7B634 /* PBXTargetDependency */ = { + F549E104AB686D4C3383DB6E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = D157564C43F0EE22553BDD68 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = D8B8700D5948E731503D5220 /* PBXContainerItemProxy */; }; - E77B703B4797C35DAC0A2760 /* PBXTargetDependency */ = { + F95C6EAD9F7184C6730E9F61 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = B6A85EF1D3CC21D987016204 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 5DC7EE59040383A84FE9D924 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1979,6 +1979,18 @@ }; name = Debug; }; + 5AFD85147E5F7EEA259481C2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + INDEX_FORCE_SCRIPT_EXECUTION = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; 690A039D63AF0A09BE54B464 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2346,18 +2358,6 @@ }; name = Debug; }; - D6C64C86AFDFF55D55C69DFF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - INDEX_FORCE_SCRIPT_EXECUTION = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; DC1884C822C7D3AD5CAA6B9E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2524,34 +2524,34 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 961CB57C52E0929989B5B13A /* Build configuration list for PBXNativeTarget "XcodeProj" */ = { + 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { isa = XCConfigurationList; buildConfigurations = ( - 690A039D63AF0A09BE54B464 /* Debug */, + 5AFD85147E5F7EEA259481C2 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 9C3B0DA5FF54217998FA354A /* Build configuration list for PBXNativeTarget "generator" */ = { + 961CB57C52E0929989B5B13A /* Build configuration list for PBXNativeTarget "XcodeProj" */ = { isa = XCConfigurationList; buildConfigurations = ( - DC1884C822C7D3AD5CAA6B9E /* Debug */, + 690A039D63AF0A09BE54B464 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - CACF77A1FAAA2F54E5824DC5 /* Build configuration list for PBXNativeTarget "PathKit" */ = { + 9C3B0DA5FF54217998FA354A /* Build configuration list for PBXNativeTarget "generator" */ = { isa = XCConfigurationList; buildConfigurations = ( - 235F4F04C2DF95E7079ED732 /* Debug */, + DC1884C822C7D3AD5CAA6B9E /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { + CACF77A1FAAA2F54E5824DC5 /* Build configuration list for PBXNativeTarget "PathKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - D6C64C86AFDFF55D55C69DFF /* Debug */, + 235F4F04C2DF95E7079ED732 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; diff --git a/test/fixtures/generator/bwx.xcodeproj/project.pbxproj b/test/fixtures/generator/bwx.xcodeproj/project.pbxproj index 5507ef183a..097585cb8e 100644 --- a/test/fixtures/generator/bwx.xcodeproj/project.pbxproj +++ b/test/fixtures/generator/bwx.xcodeproj/project.pbxproj @@ -7,16 +7,16 @@ objects = { /* Begin PBXAggregateTarget section */ - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */ = { + FE59281FE487F27A37DC2EE7 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - A82BD2D49506D22549483203 /* Fetch External Repositories */, + 790733B6E675C2785F8020AC /* Fetch External Repositories */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -265,12 +265,12 @@ remoteGlobalIDString = 3A4021D8F5FC68CD4FB8B6F1; remoteInfo = generator.library; }; - 080A300BE3115422936ABA80 /* PBXContainerItemProxy */ = { + 10F8F2838624AF67BC893D33 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; 199D8335E402470EC00D40BF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -279,12 +279,19 @@ remoteGlobalIDString = 19FA71657765A036575B20D8; remoteInfo = XcodeProj; }; - 319C30CA1810E6C4D2D31C7B /* PBXContainerItemProxy */ = { + 316E22CAB9BB9F7860D6694E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; + }; + 336B5CF2DDE3D0B832C12168 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; + proxyType = 1; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; 3A1A9FA674016F6D082BD8E2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -293,33 +300,33 @@ remoteGlobalIDString = 299DA591171C10F8AF73F244; remoteInfo = PathKit; }; - 4FA052E4857080583368FC00 /* PBXContainerItemProxy */ = { + 3D14D7C57660F3BAFA9AF781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = AFE4D24E5783CFEA55476089; - remoteInfo = AEXML; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - 5F803C1AC4A2B51D785ED2A9 /* PBXContainerItemProxy */ = { + 4FA052E4857080583368FC00 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 299DA591171C10F8AF73F244; - remoteInfo = PathKit; + remoteGlobalIDString = AFE4D24E5783CFEA55476089; + remoteInfo = AEXML; }; - 662BF6F9914221881A01EED3 /* PBXContainerItemProxy */ = { + 57526E39DC1C23E02C838E67 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - 6BFF0ED595BF75D0308AF48D /* PBXContainerItemProxy */ = { + 5F803C1AC4A2B51D785ED2A9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 299DA591171C10F8AF73F244; + remoteInfo = PathKit; }; 6DD99DE39777A6190BA3601A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -328,19 +335,19 @@ remoteGlobalIDString = B0128CCFCF9E56DA6D808193; remoteInfo = OrderedCollections; }; - 7951293FDA128320F7AB4636 /* PBXContainerItemProxy */ = { + 94E23707CC9C8CEEF247C4DB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - 97D76F5F92DB69E680400CD8 /* PBXContainerItemProxy */ = { + 98B7F3DF7B13B0E6ABB67592 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; 9B5B6558D92A38CDB5A55353 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -349,6 +356,13 @@ remoteGlobalIDString = CE60FB500B781C8126957C5A; remoteInfo = XCTestDynamicOverlay; }; + A1CB8044D09981571E9EE34D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; + proxyType = 1; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; + }; A62321D7E361A0D60CBC11C6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; @@ -363,26 +377,12 @@ remoteGlobalIDString = CFD3DFAB502EFF52937E5E51; remoteInfo = CustomDump; }; - D524A4D2429633DFDDF92CA6 /* PBXContainerItemProxy */ = { + DB651C00CC6C7BD07F2AAF7E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; - }; - FB79B5625C17E28955E462B7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; - }; - FE76E76431E4FFEDFED51D4B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; /* End PBXContainerItemProxy section */ @@ -1268,7 +1268,7 @@ buildRules = ( ); dependencies = ( - 4CFCD1BC935D0ECF7B377C05 /* PBXTargetDependency */, + 9180B355ABFEE76581F29E80 /* PBXTargetDependency */, D5F65B44A3A5B58EC00BF47B /* PBXTargetDependency */, 4460D0461ECFE2C5DB3906C8 /* PBXTargetDependency */, ); @@ -1286,7 +1286,7 @@ buildRules = ( ); dependencies = ( - C7AD4A75DA389E2877527121 /* PBXTargetDependency */, + FADB152A0FA21E3E5524594D /* PBXTargetDependency */, ); name = PathKit; productName = PathKit; @@ -1302,7 +1302,7 @@ buildRules = ( ); dependencies = ( - E32B494E5BC7AB22F804B2D4 /* PBXTargetDependency */, + 10375D5CCD79A0DFFB549B39 /* PBXTargetDependency */, 5F445F20107721899DF3B81D /* PBXTargetDependency */, ); name = generator; @@ -1319,7 +1319,7 @@ buildRules = ( ); dependencies = ( - C6E0CB98C89E381C614B4F5F /* PBXTargetDependency */, + DEDF11936E2B6985EAD6EF3D /* PBXTargetDependency */, 2EA330A1F5FEA84E4DDB6B6F /* PBXTargetDependency */, 708CE6F5066B3FED83964946 /* PBXTargetDependency */, 4AA89D33E273962408747D43 /* PBXTargetDependency */, @@ -1338,7 +1338,7 @@ buildRules = ( ); dependencies = ( - 42E285C99D0B12A259C1EA41 /* PBXTargetDependency */, + 9D4168B49068A541B3B09FA0 /* PBXTargetDependency */, ); name = AEXML; productName = AEXML; @@ -1354,7 +1354,7 @@ buildRules = ( ); dependencies = ( - FB07AD10170F77050FD96F55 /* PBXTargetDependency */, + D47489D69277FEA82D6170CB /* PBXTargetDependency */, ); name = OrderedCollections; productName = OrderedCollections; @@ -1370,7 +1370,7 @@ buildRules = ( ); dependencies = ( - 636C3A6A7019D4C48B527D3F /* PBXTargetDependency */, + B12061704177081637FBB0E6 /* PBXTargetDependency */, ); name = XCTestDynamicOverlay; productName = XCTestDynamicOverlay; @@ -1386,7 +1386,7 @@ buildRules = ( ); dependencies = ( - 7CFFDA7F05CEC82B26D1C1B4 /* PBXTargetDependency */, + DA2AC3E8FD27B24B1FC6BBA1 /* PBXTargetDependency */, BDA5A0BF9D7D71AD15621E90 /* PBXTargetDependency */, ); name = CustomDump; @@ -1403,7 +1403,7 @@ buildRules = ( ); dependencies = ( - 109C26D1DB4D01D48A8E8659 /* PBXTargetDependency */, + E7F137FA1D1A2C8BD26C3968 /* PBXTargetDependency */, 4C7A6159FE1C37782DBAFBF5 /* PBXTargetDependency */, 6B1BD6C53E3B9BE4EF005D0C /* PBXTargetDependency */, ); @@ -1438,9 +1438,6 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; - 657E5F38D9811E4DFA49DA75 = { - CreatedOnToolsVersion = 13.2.1; - }; AFE4D24E5783CFEA55476089 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; @@ -1461,6 +1458,9 @@ CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; }; + FE59281FE487F27A37DC2EE7 = { + CreatedOnToolsVersion = 13.2.1; + }; }; }; buildConfigurationList = 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */; @@ -1476,7 +1476,7 @@ projectDirPath = ../../..; projectRoot = ""; targets = ( - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */, + FE59281FE487F27A37DC2EE7 /* BazelDependencies */, AFE4D24E5783CFEA55476089 /* AEXML */, CFD3DFAB502EFF52937E5E51 /* CustomDump */, 2FED647E7A6091DF616D345B /* generator */, @@ -1491,7 +1491,7 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - A82BD2D49506D22549483203 /* Fetch External Repositories */ = { + 790733B6E675C2785F8020AC /* Fetch External Repositories */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -1813,11 +1813,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 109C26D1DB4D01D48A8E8659 /* PBXTargetDependency */ = { + 10375D5CCD79A0DFFB549B39 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 7951293FDA128320F7AB4636 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = A1CB8044D09981571E9EE34D /* PBXContainerItemProxy */; }; 2EA330A1F5FEA84E4DDB6B6F /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1825,12 +1825,6 @@ target = B0128CCFCF9E56DA6D808193 /* OrderedCollections */; targetProxy = 6DD99DE39777A6190BA3601A /* PBXContainerItemProxy */; }; - 42E285C99D0B12A259C1EA41 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 319C30CA1810E6C4D2D31C7B /* PBXContainerItemProxy */; - }; 4460D0461ECFE2C5DB3906C8 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = PathKit; @@ -1849,24 +1843,12 @@ target = CFD3DFAB502EFF52937E5E51 /* CustomDump */; targetProxy = CFBF834907E2F47679529098 /* PBXContainerItemProxy */; }; - 4CFCD1BC935D0ECF7B377C05 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = D524A4D2429633DFDDF92CA6 /* PBXContainerItemProxy */; - }; 5F445F20107721899DF3B81D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = generator.library; target = 3A4021D8F5FC68CD4FB8B6F1 /* generator.library */; targetProxy = 052BA76161805F1B8304674C /* PBXContainerItemProxy */; }; - 636C3A6A7019D4C48B527D3F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = FE76E76431E4FFEDFED51D4B /* PBXContainerItemProxy */; - }; 6B1BD6C53E3B9BE4EF005D0C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = generator.library; @@ -1879,11 +1861,23 @@ target = 299DA591171C10F8AF73F244 /* PathKit */; targetProxy = 5F803C1AC4A2B51D785ED2A9 /* PBXContainerItemProxy */; }; - 7CFFDA7F05CEC82B26D1C1B4 /* PBXTargetDependency */ = { + 9180B355ABFEE76581F29E80 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = DB651C00CC6C7BD07F2AAF7E /* PBXContainerItemProxy */; + }; + 9D4168B49068A541B3B09FA0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 336B5CF2DDE3D0B832C12168 /* PBXContainerItemProxy */; + }; + B12061704177081637FBB0E6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 662BF6F9914221881A01EED3 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 57526E39DC1C23E02C838E67 /* PBXContainerItemProxy */; }; BDA5A0BF9D7D71AD15621E90 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1891,17 +1885,11 @@ target = CE60FB500B781C8126957C5A /* XCTestDynamicOverlay */; targetProxy = 9B5B6558D92A38CDB5A55353 /* PBXContainerItemProxy */; }; - C6E0CB98C89E381C614B4F5F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 6BFF0ED595BF75D0308AF48D /* PBXContainerItemProxy */; - }; - C7AD4A75DA389E2877527121 /* PBXTargetDependency */ = { + D47489D69277FEA82D6170CB /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 97D76F5F92DB69E680400CD8 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 98B7F3DF7B13B0E6ABB67592 /* PBXContainerItemProxy */; }; D5F65B44A3A5B58EC00BF47B /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1909,17 +1897,29 @@ target = AFE4D24E5783CFEA55476089 /* AEXML */; targetProxy = 4FA052E4857080583368FC00 /* PBXContainerItemProxy */; }; - E32B494E5BC7AB22F804B2D4 /* PBXTargetDependency */ = { + DA2AC3E8FD27B24B1FC6BBA1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = FB79B5625C17E28955E462B7 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 10F8F2838624AF67BC893D33 /* PBXContainerItemProxy */; }; - FB07AD10170F77050FD96F55 /* PBXTargetDependency */ = { + DEDF11936E2B6985EAD6EF3D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 080A300BE3115422936ABA80 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 94E23707CC9C8CEEF247C4DB /* PBXContainerItemProxy */; + }; + E7F137FA1D1A2C8BD26C3968 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 316E22CAB9BB9F7860D6694E /* PBXContainerItemProxy */; + }; + FADB152A0FA21E3E5524594D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 3D14D7C57660F3BAFA9AF781 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -2089,18 +2089,6 @@ }; name = Debug; }; - 3120F32C41840B1165104AAF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - INDEX_FORCE_SCRIPT_EXECUTION = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; 4ABFE648FEDF6C610CBE9985 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2159,6 +2147,18 @@ }; name = Debug; }; + 67F44AB65FA7A2E38A56F5FB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + INDEX_FORCE_SCRIPT_EXECUTION = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; 73D2023D57A9AFF02A3DA735 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2481,14 +2481,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3120F32C41840B1165104AAF /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; 40FEEA421A7F15F350EDECCF /* Build configuration list for PBXNativeTarget "CustomDump" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2529,6 +2521,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 67F44AB65FA7A2E38A56F5FB /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; C7565EB0FDBA3197145536CA /* Build configuration list for PBXNativeTarget "tests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/test/fixtures/tvos_app/bwb.xcodeproj/project.pbxproj b/test/fixtures/tvos_app/bwb.xcodeproj/project.pbxproj index 1896d2bd99..4827112e9c 100644 --- a/test/fixtures/tvos_app/bwb.xcodeproj/project.pbxproj +++ b/test/fixtures/tvos_app/bwb.xcodeproj/project.pbxproj @@ -7,18 +7,18 @@ objects = { /* Begin PBXAggregateTarget section */ - 9281ECD979418C4678530C3F /* Bazel Dependencies */ = { + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - 2E15CEFF1306DCFD4654C60B /* Bazel Build */, - 391E7CA7B16FAFAE0457D1C2 /* Copy Files */, - 4CBF24D403529E7553176153 /* Fix Info.plists */, + 9A630CF63C380FAE522825A9 /* Bazel Build */, + CF398643BE2886B2AAE69745 /* Copy Files */, + FC6E45C2D1E2FBCFC2D1471E /* Fix Info.plists */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -31,19 +31,19 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 110986C710000A69ABE319EB /* PBXContainerItemProxy */ = { + 2A5B509CA8C5CE8F44BAEC83 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; - 1CF9C88B9ECC02A32824AAE3 /* PBXContainerItemProxy */ = { + 5A6662160CF76BEF84975212 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; 7EDBC9AA0948CBD61D742C1D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -52,12 +52,12 @@ remoteGlobalIDString = DEF15AA97EC0FE28A9A97CAA; remoteInfo = Example; }; - B71878DACFF4D4B444BFDCD1 /* PBXContainerItemProxy */ = { + DDD61C8C1CFA249BBE0E369C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0805833D09730531AD081697 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9281ECD979418C4678530C3F; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = 7E7D155EBCA520F35DEA3571; + remoteInfo = BazelDependencies; }; EBD0C87C46CE3A0065D73AA0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -302,7 +302,7 @@ buildRules = ( ); dependencies = ( - 5DFE3D6D6371279C87EFC9F6 /* PBXTargetDependency */, + CD8F780ECEDB33369CA6059E /* PBXTargetDependency */, 4D0DFDD11CB698CEA15C699E /* PBXTargetDependency */, ); name = ExampleUITests.__internal__.__test_bundle; @@ -319,7 +319,7 @@ buildRules = ( ); dependencies = ( - 1D5CD5B9BA8C334C7A88A805 /* PBXTargetDependency */, + C1C989EE8C77D1DBF32859E6 /* PBXTargetDependency */, F670F941F6741D0D3E7AC4A3 /* PBXTargetDependency */, ); name = ExampleTests.__internal__.__test_bundle; @@ -336,7 +336,7 @@ buildRules = ( ); dependencies = ( - 2047D4B3EA4C6F4853601156 /* PBXTargetDependency */, + 5F96E438EF4C12858E3D604D /* PBXTargetDependency */, ); name = Example; productName = Example; @@ -353,7 +353,7 @@ LastSwiftUpdateCheck = 1320; LastUpgradeCheck = 1320; TargetAttributes = { - 9281ECD979418C4678530C3F = { + 7E7D155EBCA520F35DEA3571 = { CreatedOnToolsVersion = 13.2.1; }; BBF4D59A51801FF17E35E34E = { @@ -385,7 +385,7 @@ projectDirPath = ../../..; projectRoot = ""; targets = ( - 9281ECD979418C4678530C3F /* Bazel Dependencies */, + 7E7D155EBCA520F35DEA3571 /* BazelDependencies */, DEF15AA97EC0FE28A9A97CAA /* Example */, D133FDFF63F008FDDB07BE99 /* ExampleTests.__internal__.__test_bundle */, BBF4D59A51801FF17E35E34E /* ExampleUITests.__internal__.__test_bundle */, @@ -394,7 +394,7 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 2E15CEFF1306DCFD4654C60B /* Bazel Build */ = { + 9A630CF63C380FAE522825A9 /* Bazel Build */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -414,7 +414,7 @@ shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n if [[ -f \"$HOME/.lldbinit\" ]]; then\n home_init=\"command source ~/.lldbinit\n\n \"\n else\n home_init=\"\"\n fi\n\n cat < \"$BAZEL_LLDB_INIT\"\n$home_init\\\n# Set \\`CWD\\` to \\`\\$SRCROOT\\` so relative paths in binaries work\nplatform settings -w \"$SRCROOT\"\n\n# \"Undo\" \\`-debug-prefix-map\\`\nsettings set target.source-map ./external/ \"$external\"\nsettings append target.source-map ./ \"$SRCROOT\"\nEOF\nfi\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\noutput_groups=()\nif [ -s \"$BAZEL_BUILD_OUTPUT_GROUPS_FILE\" ]; then\n while IFS= read -r output_group; do\n output_groups+=(\"--output_groups=+$output_group\")\n done < \"$BAZEL_BUILD_OUTPUT_GROUPS_FILE\"\nfi\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n ${output_groups[@]+\"${output_groups[@]}\"} \\\n //test/fixtures/tvos_app:xcodeproj_bwb\n"; showEnvVarsInLog = 0; }; - 391E7CA7B16FAFAE0457D1C2 /* Copy Files */ = { + CF398643BE2886B2AAE69745 /* Copy Files */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -435,7 +435,7 @@ shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; showEnvVarsInLog = 0; }; - 4CBF24D403529E7553176153 /* Fix Info.plists */ = { + FC6E45C2D1E2FBCFC2D1471E /* Fix Info.plists */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -488,29 +488,29 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1D5CD5B9BA8C334C7A88A805 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 110986C710000A69ABE319EB /* PBXContainerItemProxy */; - }; - 2047D4B3EA4C6F4853601156 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = 1CF9C88B9ECC02A32824AAE3 /* PBXContainerItemProxy */; - }; 4D0DFDD11CB698CEA15C699E /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Example; target = DEF15AA97EC0FE28A9A97CAA /* Example */; targetProxy = EBD0C87C46CE3A0065D73AA0 /* PBXContainerItemProxy */; }; - 5DFE3D6D6371279C87EFC9F6 /* PBXTargetDependency */ = { + 5F96E438EF4C12858E3D604D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = DDD61C8C1CFA249BBE0E369C /* PBXContainerItemProxy */; + }; + C1C989EE8C77D1DBF32859E6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 5A6662160CF76BEF84975212 /* PBXContainerItemProxy */; + }; + CD8F780ECEDB33369CA6059E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 9281ECD979418C4678530C3F /* Bazel Dependencies */; - targetProxy = B71878DACFF4D4B444BFDCD1 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = 7E7D155EBCA520F35DEA3571 /* BazelDependencies */; + targetProxy = 2A5B509CA8C5CE8F44BAEC83 /* PBXContainerItemProxy */; }; F670F941F6741D0D3E7AC4A3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -581,6 +581,18 @@ }; name = Debug; }; + 5AFD85147E5F7EEA259481C2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; + BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; + INDEX_FORCE_SCRIPT_EXECUTION = YES; + SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; + SUPPORTS_MACCATALYST = YES; + TARGET_NAME = BazelDependencies; + }; + name = Debug; + }; B0892EE2AB907B40AA4EB960 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -608,18 +620,6 @@ }; name = Debug; }; - D6C64C86AFDFF55D55C69DFF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - BAZEL_PACKAGE_BIN_DIR = rules_xcodeproj; - INDEX_FORCE_SCRIPT_EXECUTION = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos"; - SUPPORTS_MACCATALYST = YES; - TARGET_NAME = BazelDependencies; - }; - name = Debug; - }; ED022D7827FA072088152A34 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -782,10 +782,10 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - CBAD4D93C81A6196323B1482 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { + 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { isa = XCConfigurationList; buildConfigurations = ( - D6C64C86AFDFF55D55C69DFF /* Debug */, + 5AFD85147E5F7EEA259481C2 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; diff --git a/test/fixtures/tvos_app/bwx.xcodeproj/project.pbxproj b/test/fixtures/tvos_app/bwx.xcodeproj/project.pbxproj index 13564e816e..d77eff4de6 100644 --- a/test/fixtures/tvos_app/bwx.xcodeproj/project.pbxproj +++ b/test/fixtures/tvos_app/bwx.xcodeproj/project.pbxproj @@ -7,18 +7,18 @@ objects = { /* Begin PBXAggregateTarget section */ - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */ = { + FE59281FE487F27A37DC2EE7 /* BazelDependencies */ = { isa = PBXAggregateTarget; - buildConfigurationList = 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */; + buildConfigurationList = A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */; buildPhases = ( - EFD5DC5BF35D589213C98597 /* Generate Files */, - 14DE13B950F0A4E49F5CF508 /* Copy Files */, - FF8B0244BAA1F32D8929C997 /* Fix Info.plists */, + 773C70B69E7F801B38FDC01C /* Generate Files */, + 87B0BF431191C40A5DA3740B /* Copy Files */, + A1B677A301B894FBD0B5AB58 /* Fix Info.plists */, ); dependencies = ( ); - name = "Bazel Dependencies"; - productName = "Bazel Dependencies"; + name = BazelDependencies; + productName = BazelDependencies; }; /* End PBXAggregateTarget section */ @@ -31,12 +31,12 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 55D8683784886A4A2DE0797F /* PBXContainerItemProxy */ = { + 7234AC8138012B37C733E0DD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; 8499CD2F34D395AA377AFF38 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -45,19 +45,19 @@ remoteGlobalIDString = 9E46111B59CD5CC4865299C2; remoteInfo = Example; }; - 9BC443317E7CE097B2BC3F22 /* PBXContainerItemProxy */ = { + BE6EDAD5DB3541ECD288BFD9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; - B7A58450E8974BF0DDB3874D /* PBXContainerItemProxy */ = { + DFB6B3D768109FDA95CBEF01 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 36B5F79C7ED8B081842AF69D /* Project object */; proxyType = 1; - remoteGlobalIDString = 657E5F38D9811E4DFA49DA75; - remoteInfo = "Bazel Dependencies"; + remoteGlobalIDString = FE59281FE487F27A37DC2EE7; + remoteInfo = BazelDependencies; }; ED9670CE9ACD8301A0DA97C3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -302,7 +302,7 @@ buildRules = ( ); dependencies = ( - D88707E90E059FB39F3F6680 /* PBXTargetDependency */, + 14E804A128DFD5D70ABAFC40 /* PBXTargetDependency */, EA5A8DB030DD28F2F1A365FE /* PBXTargetDependency */, ); name = ExampleTests.__internal__.__test_bundle; @@ -319,7 +319,7 @@ buildRules = ( ); dependencies = ( - D85FAC7924D560883A5EC96A /* PBXTargetDependency */, + AB1C3081B4C14FDC3D765DFD /* PBXTargetDependency */, ); name = Example; productName = Example; @@ -335,7 +335,7 @@ buildRules = ( ); dependencies = ( - 5DDC602419E90C9570AA2AD7 /* PBXTargetDependency */, + FBC2860EC37A52113D12C8E2 /* PBXTargetDependency */, 2D8ED23480A44C6BB910460C /* PBXTargetDependency */, ); name = ExampleUITests.__internal__.__test_bundle; @@ -358,9 +358,6 @@ LastSwiftMigration = 1320; TestTargetID = 9E46111B59CD5CC4865299C2; }; - 657E5F38D9811E4DFA49DA75 = { - CreatedOnToolsVersion = 13.2.1; - }; 9E46111B59CD5CC4865299C2 = { CreatedOnToolsVersion = 13.2.1; LastSwiftMigration = 1320; @@ -370,6 +367,9 @@ LastSwiftMigration = 1320; TestTargetID = 9E46111B59CD5CC4865299C2; }; + FE59281FE487F27A37DC2EE7 = { + CreatedOnToolsVersion = 13.2.1; + }; }; }; buildConfigurationList = 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */; @@ -385,7 +385,7 @@ projectDirPath = ../../..; projectRoot = ""; targets = ( - 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */, + FE59281FE487F27A37DC2EE7 /* BazelDependencies */, 9E46111B59CD5CC4865299C2 /* Example */, 5742A33EA302007E9758E24B /* ExampleTests.__internal__.__test_bundle */, BDC5BB543739DEC8809249F9 /* ExampleUITests.__internal__.__test_bundle */, @@ -394,48 +394,48 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 14DE13B950F0A4E49F5CF508 /* Copy Files */ = { + 773C70B69E7F801B38FDC01C /* Generate Files */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - "$(INTERNAL_DIR)/generated.xcfilelist", - ); inputPaths = ( ); - name = "Copy Files"; + name = "Generate Files"; outputFileListPaths = ( - "$(INTERNAL_DIR)/generated.copied.xcfilelist", + "$(INTERNAL_DIR)/external.xcfilelist", + "$(INTERNAL_DIR)/generated.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; + shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n //test/fixtures/tvos_app:xcodeproj_bwx\n"; showEnvVarsInLog = 0; }; - EFD5DC5BF35D589213C98597 /* Generate Files */ = { + 87B0BF431191C40A5DA3740B /* Copy Files */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + "$(INTERNAL_DIR)/generated.xcfilelist", + ); inputPaths = ( ); - name = "Generate Files"; + name = "Copy Files"; outputFileListPaths = ( - "$(INTERNAL_DIR)/external.xcfilelist", - "$(INTERNAL_DIR)/generated.xcfilelist", + "$(INTERNAL_DIR)/generated.copied.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # We use a different output base for Index Build to prevent normal builds and\n # indexing waiting on bazel locks from the other\n output_base=\"$OBJROOT/bazel_output_base\"\nfi\n\noutput_path=$(env -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n info \\\n --experimental_convenience_symlinks=ignore \\\n output_path)\nexternal=\"${output_path%/*/*/*}/external\"\n\n# We only want to modify `$LINKS_DIR` during normal builds since Indexing can\n# run concurrent to normal builds\nif [ \"$ACTION\" != \"indexbuild\" ]; then\n mkdir -p \"$LINKS_DIR\"\n cd \"$LINKS_DIR\"\n\n # Add BUILD and DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n # files to the internal links directory to prevent Bazel from recursing into\n # it, and thus following the `external` symlink\n touch BUILD\n touch DONT_FOLLOW_SYMLINKS_WHEN_TRAVERSING_THIS_DIRECTORY_VIA_A_RECURSIVE_TARGET_PATTERN\n\n # Need to remove the directories that Xcode creates as part of output prep\n rm -rf external\n rm -rf gen_dir\n\n ln -sf \"$external\" external\n ln -sf \"$BUILD_DIR/bazel-out\" gen_dir\nfi\n\ncd \"$BUILD_DIR\"\n\nrm -rf external\nrm -rf real-bazel-out\n\nln -sf \"$external\" external\nln -sf \"$output_path\" real-bazel-out\nln -sfn \"$PROJECT_DIR\" SRCROOT\n\n# Create parent directories of generated files, so the project navigator works\n# better faster\n\nmkdir -p bazel-out\ncd bazel-out\n\nsed 's|\\/[^\\/]*$||' \\\n \"$INTERNAL_DIR/generated.rsynclist\" \\\n | uniq \\\n | while IFS= read -r dir\ndo\n mkdir -p \"$dir\"\ndone\n\ncd \"$SRCROOT\"\n\ndate +%s > \"$INTERNAL_DIR/toplevel_cache_buster\"\n\nenv -i \\\n DEVELOPER_DIR=\"$DEVELOPER_DIR\" \\\n HOME=\"$HOME\" \\\n PATH=\"${PATH//\\/usr\\/local\\/bin//opt/homebrew/bin:/usr/local/bin}\" \\\n USER=\"$USER\" \\\n \"$BAZEL_PATH\" \\\n ${output_base:+--output_base \"$output_base\"} \\\n build \\\n --experimental_convenience_symlinks=ignore \\\n --output_groups=generated_inputs \\\n //test/fixtures/tvos_app:xcodeproj_bwx\n"; + shellScript = "set -euo pipefail\n\ncd \"$BAZEL_OUT\"\n\n# Sync to \"$BUILD_DIR/bazel-out\". This is the same as \"$GEN_DIR\" for normal\n# builds, but is different for Index Builds. `PBXBuildFile`s will use the\n# \"$GEN_DIR\" version, so indexing might get messed up until they are normally\n# generated. It's the best we can do though as we need to use the `gen_dir`\n# symlink.\nrsync \\\n --files-from \"$INTERNAL_DIR/generated.rsynclist\" \\\n --chmod=u+w \\\n -L \\\n . \\\n \"$BUILD_DIR/bazel-out\"\n"; showEnvVarsInLog = 0; }; - FF8B0244BAA1F32D8929C997 /* Fix Info.plists */ = { + A1B677A301B894FBD0B5AB58 /* Fix Info.plists */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -488,29 +488,23 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 14E804A128DFD5D70ABAFC40 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = BE6EDAD5DB3541ECD288BFD9 /* PBXContainerItemProxy */; + }; 2D8ED23480A44C6BB910460C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Example; target = 9E46111B59CD5CC4865299C2 /* Example */; targetProxy = ED9670CE9ACD8301A0DA97C3 /* PBXContainerItemProxy */; }; - 5DDC602419E90C9570AA2AD7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = B7A58450E8974BF0DDB3874D /* PBXContainerItemProxy */; - }; - D85FAC7924D560883A5EC96A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 55D8683784886A4A2DE0797F /* PBXContainerItemProxy */; - }; - D88707E90E059FB39F3F6680 /* PBXTargetDependency */ = { + AB1C3081B4C14FDC3D765DFD /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "Bazel Dependencies"; - target = 657E5F38D9811E4DFA49DA75 /* Bazel Dependencies */; - targetProxy = 9BC443317E7CE097B2BC3F22 /* PBXContainerItemProxy */; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = DFB6B3D768109FDA95CBEF01 /* PBXContainerItemProxy */; }; EA5A8DB030DD28F2F1A365FE /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -518,6 +512,12 @@ target = 9E46111B59CD5CC4865299C2 /* Example */; targetProxy = 8499CD2F34D395AA377AFF38 /* PBXContainerItemProxy */; }; + FBC2860EC37A52113D12C8E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BazelDependencies; + target = FE59281FE487F27A37DC2EE7 /* BazelDependencies */; + targetProxy = 7234AC8138012B37C733E0DD /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -580,7 +580,7 @@ }; name = Debug; }; - 3120F32C41840B1165104AAF /* Debug */ = { + 67F44AB65FA7A2E38A56F5FB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; @@ -753,26 +753,26 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 1CF9208AFC262BED8CB8A0A9 /* Build configuration list for PBXAggregateTarget "Bazel Dependencies" */ = { + 2E81F0BC3C859DAC10F012BE /* Build configuration list for PBXNativeTarget "ExampleTests.__internal__.__test_bundle" */ = { isa = XCConfigurationList; buildConfigurations = ( - 3120F32C41840B1165104AAF /* Debug */, + A0DA4321BC5CEDE7AEC20E53 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 2E81F0BC3C859DAC10F012BE /* Build configuration list for PBXNativeTarget "ExampleTests.__internal__.__test_bundle" */ = { + 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */ = { isa = XCConfigurationList; buildConfigurations = ( - A0DA4321BC5CEDE7AEC20E53 /* Debug */, + C221D886D6D02D33114D3473 /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 8C14447CB8BDD86ECF450932 /* Build configuration list for PBXProject "bwx" */ = { + A4C19F2824EAB3EBB5D7EE24 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */ = { isa = XCConfigurationList; buildConfigurations = ( - C221D886D6D02D33114D3473 /* Debug */, + 67F44AB65FA7A2E38A56F5FB /* Debug */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; diff --git a/tools/generator/src/Generator+AddBazelDependenciesTarget.swift b/tools/generator/src/Generator+AddBazelDependenciesTarget.swift index cd09be5e65..7b3bf14932 100644 --- a/tools/generator/src/Generator+AddBazelDependenciesTarget.swift +++ b/tools/generator/src/Generator+AddBazelDependenciesTarget.swift @@ -83,7 +83,7 @@ env -i \ ) let pbxTarget = PBXAggregateTarget( - name: "Bazel Dependencies", + name: "BazelDependencies", buildConfigurationList: configurationList, buildPhases: [ bazelBuildScript, @@ -91,7 +91,7 @@ env -i \ fixModuleMapsScript, fixInfoPlistsScript, ].compactMap { $0 }, - productName: "Bazel Dependencies" + productName: "BazelDependencies" ) pbxProj.add(object: pbxTarget) pbxProject.targets.append(pbxTarget) diff --git a/tools/generator/test/Fixtures.swift b/tools/generator/test/Fixtures.swift index 4d96825a4a..a4986cdcf7 100644 --- a/tools/generator/test/Fixtures.swift +++ b/tools/generator/test/Fixtures.swift @@ -1056,14 +1056,14 @@ done < "$SCRIPT_INPUT_FILE_LIST_0" let pbxProject = pbxProj.rootObject! let target = PBXAggregateTarget( - name: "Bazel Dependencies", + name: "BazelDependencies", buildConfigurationList: configurationList, buildPhases: [ generateFilesScript, copyFilesScript, fixModulemapsScript, ], - productName: "Bazel Dependencies" + productName: "BazelDependencies" ) pbxProj.add(object: target) pbxProject.targets.append(target) diff --git a/xcodeproj/internal/installer.template.sh b/xcodeproj/internal/installer.template.sh index 137e2d4528..fc23b05ec7 100644 --- a/xcodeproj/internal/installer.template.sh +++ b/xcodeproj/internal/installer.template.sh @@ -77,11 +77,11 @@ if [[ \ cd "$BUILD_WORKSPACE_DIRECTORY" error_log=$(mktemp) exit_status=0 - xcodebuild -project "$dest" -scheme "Bazel Dependencies" \ + xcodebuild -project "$dest" -scheme "BazelDependencies" \ > "$error_log" 2>&1 \ || exit_status=$? if [ $exit_status -ne 0 ]; then - echo "WARNING: Failed to build \"Bazel Dependencies\" scheme:" + echo "WARNING: Failed to build \"BazelDependencies\" scheme:" cat "$error_log" >&2 fi fi