-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Removing the Duplicate Declarations from the Builder and Context #881
Merged
tinder-SamMarshall
merged 13 commits into
main
from
feature/new-interface-template-remove-from-existing
Feb 18, 2025
Merged
Removing the Duplicate Declarations from the Builder and Context #881
tinder-SamMarshall
merged 13 commits into
main
from
feature/new-interface-template-remove-from-existing
Feb 18, 2025
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ace-template-remove-from-existing
tinder-cfuller
previously approved these changes
Feb 14, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add templates
label before merging. Thank you!
The base branch was changed.
…xisting # Conflicts: # Tests/NodesGeneratorTests/__Snapshots__/PresetGeneratorTests/testGenerateAppPreset.Contents-AppBuilder-swift.txt # Tests/NodesGeneratorTests/__Snapshots__/PresetGeneratorTests/testGenerateRootPreset.Contents-RootBuilder-swift.txt # Tests/NodesGeneratorTests/__Snapshots__/PresetGeneratorTests/testGenerateScenePreset.Contents-WindowSceneBuilder-swift.txt # Tests/NodesGeneratorTests/__Snapshots__/PresetGeneratorTests/testGenerateWindowPreset.Contents-WindowBuilder-swift.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-AppKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-AppKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-AppKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-Custom-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-Custom-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-Custom-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-UIKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-UIKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode.Builder-UIKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetApp.Builder-UIKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetApp.Builder-UIKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetApp.Builder-UIKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetRoot.Builder-UIKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetRoot.Builder-UIKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetRoot.Builder-UIKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetScene.Builder-UIKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetScene.Builder-UIKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetScene.Builder-UIKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetWindow.Builder-UIKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetWindow.Builder-UIKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodePresetWindow.Builder-UIKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodeViewInjected.Builder-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodeViewInjected.Builder-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNodeViewInjected.Builder-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-AppKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-AppKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-AppKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-Custom-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-Custom-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-Custom-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-UIKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-UIKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPlugin.Builder-UIKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-AppKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-AppKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-AppKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-Custom-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-Custom-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-Custom-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-UIKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-UIKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withPluginAndTests.Builder-UIKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-AppKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-AppKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-AppKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-Custom-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-Custom-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-Custom-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-UIKit-mockCount-0.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-UIKit-mockCount-1.txt # Tests/NodesGeneratorTests/__Snapshots__/StencilRendererTests/testRenderNode_withTests.Builder-UIKit-mockCount-2.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithIdentifier.Contents-AppKit-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithIdentifier.Contents-AppKitCreatedForPluginList-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithIdentifier.Contents-Custom-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithIdentifier.Contents-CustomCreatedForPluginList-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithIdentifier.Contents-UIKit-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithIdentifier.Contents-UIKitCreatedForPluginList-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithIdentifier.Contents-ViewInjected-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithURL.Contents-AppKit-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithURL.Contents-AppKitCreatedForPluginList-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithURL.Contents-Custom-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithURL.Contents-CustomCreatedForPluginList-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithURL.Contents-UIKit-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithURL.Contents-UIKitCreatedForPluginList-Builder.txt # Tests/NodesGeneratorTests/__Snapshots__/XcodeTemplateGeneratorTests/testGenerateWithURL.Contents-ViewInjected-Builder.txt
tinder-cfuller
approved these changes
Feb 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This removed the declarations of the Flow, Listener and Builder protocols from their previous location in the Builder and Context swift files.
These are now living in Interface.swift for easier use between modules.
See: #880