Skip to content

Remove single merge restriction on target merging #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Aug 18, 2022
Merged

Remove single merge restriction on target merging #937

merged 2 commits into from
Aug 18, 2022

Conversation

brentleyjones
Copy link
Contributor

This can result in multiple targets building the same code in BwX mode, but if that isn't desired a minimal target can be inserted to mimic the previous behavior.

This change makes working with SwiftUI Previews nicer, as you can create a demo application for each swift_library.

@brentleyjones brentleyjones enabled auto-merge (squash) August 18, 2022 12:58
@brentleyjones
Remove single merge restriction on target merging
8506d60 
This can result in multiple targets building the same code in BwX mode, but if that isn't desired a minimal target can be inserted to mimic the previous behavior.

This change makes working with SwiftUI Previews nicer, as you can create a demo application for each `swift_library`.
@brentleyjones
Lint
be6abef
@brentleyjones brentleyjones force-pushed the bj/remove-single-merge-restriction-on-target-merging branch from 23f10a0 to be6abef Compare August 18, 2022 14:12
@brentleyjones brentleyjones merged commit e798025 into main Aug 18, 2022
@brentleyjones brentleyjones deleted the bj/remove-single-merge-restriction-on-target-merging branch August 18, 2022 15:11
@brentleyjones
Copy link
Contributor Author

This can result in build errors in Xcode:

Multiple commands produce '/Users/brentley/Library/Developer/Xcode/DerivedData/bwb-abwjtbepqldofpcykwlqoicwalrf/Index/Build/Products/bazel-out/watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-6e56652cb606/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension.swiftmodule/x86_64-apple-watchos-simulator.swiftmodule'

• Target 'watchOSAppExtension' (project 'bwb') has copy command from '/Users/brentley/Library/Developer/Xcode/DerivedData/bwb-abwjtbepqldofpcykwlqoicwalrf/Index/Build/Intermediates.noindex/bwb.build/bazel-out/watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-6e56652cb606/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension/Objects-normal/x86_64/watchOSAppExtension.swiftmodule' to '/Users/brentley/Library/Developer/Xcode/DerivedData/bwb-abwjtbepqldofpcykwlqoicwalrf/Index/Build/Products/bazel-out/watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-6e56652cb606/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension.swiftmodule/x86_64-apple-watchos-simulator.swiftmodule'

• Target 'watchOSAppExtension.library' (project 'bwb') has copy command from '/Users/brentley/Library/Developer/Xcode/DerivedData/bwb-abwjtbepqldofpcykwlqoicwalrf/Index/Build/Intermediates.noindex/bwb.build/bazel-out/watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-6e56652cb606/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension.library/Objects-normal/x86_64/watchOSAppExtension.swiftmodule' to '/Users/brentley/Library/Developer/Xcode/DerivedData/bwb-abwjtbepqldofpcykwlqoicwalrf/Index/Build/Products/bazel-out/watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-6e56652cb606/bin/examples/multiplatform/watchOSAppExtension/watchOSAppExtension.swiftmodule/x86_64-apple-watchos-simulator.swiftmodule'

I'm thinking about how to resolve this, possibly with VFS overlay magic, but I might have to revert this.

brentleyjones added a commit that referenced this pull request Sep 1, 2022
@brentleyjones
Revert "Remove single merge restriction on target merging (#937)"
08ef24f 
This reverts commit e798025.

Allowing a target to be both merged and unmerged can commonly result in colliding output paths for swiftmodules.

It also improves the target merging to prevent all versions of a target from merging, to prevent issues with target consolidation.
@brentleyjones brentleyjones mentioned this pull request Sep 1, 2022
Merged
brentleyjones added a commit that referenced this pull request Sep 1, 2022
@brentleyjones
Revert "Remove single merge restriction on target merging (#937)"
532de6a 
This reverts commit e798025.

Allowing a target to be both merged and unmerged can commonly result in colliding output paths for swiftmodules.

It also improves the target merging to prevent all versions of a target from merging, to prevent issues with target consolidation.
brentleyjones added a commit that referenced this pull request Sep 1, 2022
@brentleyjones
Revert "Remove single merge restriction on target merging (#937)" (#1017
19c7708 
)

This reverts commit e798025: #937 (comment).

Allowing a target to be both merged and unmerged can commonly result in colliding output paths for swiftmodules.

It also improves the target merging to prevent all versions of a target from merging, to prevent issues with target consolidation.
brentleyjones added a commit that referenced this pull request Sep 28, 2022
@brentleyjones
Revert "Revert "Remove single merge restriction on target merging (#937…
9b98cfe 
…)" (#1017)"

This reverts commit 19c7708.

With 7215544, we no longer have duplicate output errors in Xcode.
brentleyjones added a commit that referenced this pull request Sep 28, 2022
@brentleyjones
Revert "Revert "Remove single merge restriction on target merging (#937…
38ba3ce 
…)" (#1017)"

This reverts commit 19c7708.

With 7215544, we no longer have duplicate output errors in Xcode.
brentleyjones added a commit that referenced this pull request Sep 28, 2022
@brentleyjones
Revert "Revert "Remove single merge restriction on target merging (#937…
06ddf96 
…)" (#1017)"

This reverts commit 19c7708.

With 7215544, we no longer have duplicate output errors in Xcode.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxwellE maxwellE Awaiting requested review from maxwellE

@BalestraPatrick BalestraPatrick Awaiting requested review from BalestraPatrick

1 more reviewer

@cgrindel cgrindel cgrindel approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@brentleyjones @cgrindel