Skip to content
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

Conversation

tinder-SamMarshall
Copy link
Contributor

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

tinder-cfuller
tinder-cfuller previously approved these changes Feb 14, 2025
Copy link
Collaborator

@tinder-cfuller tinder-cfuller left a 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!

Base automatically changed from feature/new-interface-template to main February 14, 2025 21:18
@tinder-SamMarshall tinder-SamMarshall dismissed tinder-cfuller’s stale review February 14, 2025 21:18

The base branch was changed.

@tinder-SamMarshall tinder-SamMarshall added the templates Templates label Feb 14, 2025
…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-SamMarshall tinder-SamMarshall merged commit cb6dd2e into main Feb 18, 2025
4 of 5 checks passed
@tinder-SamMarshall tinder-SamMarshall deleted the feature/new-interface-template-remove-from-existing branch February 18, 2025 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
templates Templates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants