Release 6.1.0

[djbe]

Fixes #582.
Big PR because it targets master.

Note: After this is merged, we need to merge it back into develop.

[SwiftGen-Eve]

	1 Warning
⚠️	Big PR

	1 Message
📖	This is a Release PR

Hey 👋 I'm Eve, the friendly bot watching over SwiftGen 🤖

Thanks a lot for your contribution!

---

ChangeLog check

✅ All entries seems OK (end with period + 2 spaces, correct links)

Release version check

Check	Status
Bundler installed	✅
SwiftGen.podspec	👉 6.1.0
SwiftGenKit.podspec	👉 6.1.0
SwiftGen & SwiftGenKit versions equal	✅
SwiftGen-Info.plist version matches	✅
SwiftGenKit-Info.plist version matches	✅
StencilSwiftKit up-to-date (latest: 2.7.2)	✅
CHANGELOG: Release entry added	✅
CHANGELOG: No develop entry	✅
README: pod version ~> 6.0	✅

Seems like everything is in order 👍 You did a good job here! 🤝

Generated by 🚫 Danger

[djbe]

This branch is out-of-date with the base branch

I'm curious if we actually need to update the branch or not. The only thing on master is the actual "merge" commit from 6.0.2. The contents of that have already been merged back into develop. Maybe it's just something that GitHub doesn't handle (yet?).

[AliSoftware]

So if you try to merge master into this branch (as GitHub suggests with this message) the merge commit will be empty then, right?

Maybe the fact that we sometimes rebase and force-push commits means that there's a commit in master that has a corresponding identical commit in this branch, but with a different sha1, so GitHub don't realize they're the same?

[AliSoftware]

PS: me likey that Danger summary, very reassuring 👍 should we have another release of StencilSwiftKit (maybe with stencilproject/Stencil#268) before that next SwiftGen release or are we good to go on that front?

[djbe]

Nah we only rebase inside PRs, that shouldn't be an issue.

The only thing on master is the merge commit from 6.0.2 (b34e66f), the contents of which also exist on develop (fa1dfd9). Git is smart about that and knows that those changes are the same during a later merge. GitHub isn't?

[djbe]

I don't think that the merge button is blocked because of this, it's only a warning. Merging is blocked for now because there's no review yet.

[djbe]

I don't think we need another StencilSwiftKit or Stencil release? Our codebase is only Swift 4.2, and nothing else has changed in Stencil. I did a SSK release a couple of days ago (2.7.2)

[AliSoftware]

Now that I think about it, the .txt format for colors looks a lot like a YAML dictionary… so maybe in a future release we could deprecate the .txt extension and add a YAMLFileParser for colors instead, and tell users to just rename their colors.txt to colors.yml when doing the migration? Not for this PR obviously, but just a thought for the future of SwiftGen and for slowly deprecating a legacy historical proprietary format we created in the early days of SwiftGen 😛 )

[djbe]

Sure. We can even add the .txt extension to the future yaml parser if we want. Or just drop it completely, no idea how many people ever used it?

[AliSoftware]

Yeah I think when times comes we should drop it completely. It was probably used by many in the early days of SwiftGen, so some legacy projects might still have kept using that format, but if all it takes is to change the extension of their file from .txt to .yml…

We'll have time to discuss that in the future when we decide to do a pass on things we want to deprecate or cleanup for future releases