Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

Reorganize templates in subdirectories #13

Merged
merged 7 commits into from
May 10, 2017

Conversation

djbe
Copy link
Member

@djbe djbe commented Jan 30, 2017

Fixes #1.

Needs modifications in the swiftgen CLI code.

@djbe djbe force-pushed the feature/templates-in-subdirectories branch from c524eaf to 73d7e99 Compare January 30, 2017 12:25
@AliSoftware AliSoftware self-assigned this Feb 12, 2017
@djbe djbe force-pushed the feature/templates-in-subdirectories branch from 73d7e99 to 9229605 Compare February 19, 2017 15:19
@djbe djbe added this to the SwiftGen 5.0 (breaking) milestone Feb 23, 2017
@djbe djbe force-pushed the feature/templates-in-subdirectories branch from 5cef97e to cec3634 Compare February 23, 2017 10:56
@djbe djbe force-pushed the feature/templates-in-subdirectories branch from cec3634 to 922e0c9 Compare March 5, 2017 22:39
@djbe
Copy link
Member Author

djbe commented May 10, 2017

@AliSoftware this is the subdir PR that I mentioned. The only thing it does is move the templates, and modify the testing code to handle these changes.

The only annoyance remains the iOS/macOS storyboards thing. Eventually I'd like to somehow merge these two, they are quite similar. But that'd be something for another issue/PR.

@AliSoftware
Copy link
Collaborator

Renaming default to swift2 will be handled in a separate PR, right?

Copy link
Collaborator

@AliSoftware AliSoftware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (as long as the renaming of default will be handled in a separate PR).

But we should definitely test running rake cli:install['~/Desktop/SGTest'] (after checkout-ing the appropriate branches for this PR and the one in SwiftGen), then test the local install with a named template, to ensure it finds it as expected. Haven't had time to test that on a Mac yet to fully validate this PR pair.

@djbe
Copy link
Member Author

djbe commented May 10, 2017

The swiftgen branch already points to this one, and I just tried the install, it works correctly.

@djbe djbe merged commit 66a42d5 into master May 10, 2017
@djbe djbe deleted the feature/templates-in-subdirectories branch May 10, 2017 14:08
@djbe
Copy link
Member Author

djbe commented May 10, 2017

Regarding your default->swift2 comment, yeah, I'm splitting everything up in small(-ish) steps.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants