Merge pull request #106 from SwiftGen/feature/changelog-sections

Re-order changelog sections

CHANGELOG.md

@@ -4,15 +4,15 @@
 
 ## Master
 
-### Bug Fixes
+### Breaking Changes
 
 _None_
 
-### Breaking Changes
+### New Features
 
 _None_
 
-### New Features
+### Bug Fixes
 
 _None_
 
@@ -32,13 +32,26 @@ _None_
 
 * Improved the documentation of string filters a bit for a better overview of the inputs & outputs.  
   [David Jennes](https://github.com/djbe)
-  [#102](https://github.com/AliSoftware/SwiftGen/pull/102)
+  [#102](https://github.com/SwiftGen/StencilSwiftKit/pull/102)
 * Updated to latest Xcode (10.0).  
   [David Jennes](https://github.com/djbe)
   [#103](https://github.com/SwiftGen/StencilSwiftKit/pull/103)
 
 ## 2.6.0
 
+### New Features
+
+* The `set` tag can now directly accept an expression as value, see the
+  [documentation](https://github.com/SwiftGen/StencilSwiftKit/blob/master/Documentation/tag-set.md)
+  for an explanation on how this differs with the normal `set`/`endset`
+  pair.  
+  [David Jennes](https://github.com/djbe)
+  [#87](https://github.com/SwiftGen/StencilSwiftKit/pull/87)
+* Updated Stencil to the latest version (0.12.1).  
+  [David Jennes](https://github.com/djbe)
+  [#95](https://github.com/SwiftGen/StencilSwiftKit/pull/95)
+  [#99](https://github.com/SwiftGen/StencilSwiftKit/pull/99)
+
 ### Bug fixes
 
 * Fixed using filter expression in call node.  
@@ -52,19 +65,6 @@ _None_
   [Philip Jander](https://github.com/janderit)
   [#94](https://github.com/SwiftGen/StencilSwiftKit/pull/94)
 
-### New Features
-
-* The `set` tag can now directly accept an expression as value, see the
-  [documentation](https://github.com/SwiftGen/StencilSwiftKit/blob/master/Documentation/tag-set.md)
-  for an explanation on how this differs with the normal `set`/`endset`
-  pair.  
-  [David Jennes](https://github.com/djbe)
-  [#247](https://github.com/AliSoftware/SwiftGen/pull/247)
-* Updated Stencil to the latest version (0.12.1).  
-  [David Jennes](https://github.com/djbe)
-  [#95](https://github.com/SwiftGen/StencilSwiftKit/pull/95)
-  [#99](https://github.com/SwiftGen/StencilSwiftKit/pull/99)
-
 ### Internal Changes
 
 * Updated to latest Xcode (9.3.0).  
@@ -113,19 +113,19 @@ _None_
 
 ## 2.3.0
 
-### Bug Fixes
-
-* Workaround for `parseString` to support `NSString`.  
-  [Antondomashnev](https://github.com/antondomashnev)
-  [#68](https://github.com/SwiftGen/StencilSwiftKit/pull/68)
-
 ### New Features
 
 * Added `Parameters.flatten(dictionary:)` method to do the opposite of
   `Parameters.parse(items:)` and turn a dictionary into the list of parameters to pass from the command line.  
   [Olivier Halligon](https://github.com/AliSoftware)
   [#70](https://github.com/SwiftGen/StencilSwiftKit/pull/70)
 
+### Bug Fixes
+
+* Workaround for `parseString` to support `NSString`.  
+  [Antondomashnev](https://github.com/antondomashnev)
+  [#68](https://github.com/SwiftGen/StencilSwiftKit/pull/68)
+
 ## 2.2.0
 
 ### New Features
@@ -172,12 +172,6 @@ _None_
 Due to the removal of legacy code, there are a few breaking changes in this new version that affect both template writers as well as developers. We've provided a migration guide to help you through these changes, which you can find here:
 [Migration Guide for 2.0](https://github.com/SwiftGen/StencilSwiftKit/blob/master/Documentation/MigrationGuide.md#stencilswiftkit-20-swiftgen-50)
 
-### Bug Fixes
-
-* Fix `snakeToCamelCase` parameters information in README.  
-  [Liquidsoul](https://github.com/Liquidsoul)
-  [#45](https://github.com/SwiftGen/StencilSwiftKit/issues/45)
-
 ### Breaking Changes
 
 * The `ParametersError` enum has been replaced by the `Parameters.Error` nested type.  
@@ -209,20 +203,26 @@ Due to the removal of legacy code, there are a few breaking changes in this new
   [#47](https://github.com/SwiftGen/StencilSwiftKit/issues/47)
   [#48](https://github.com/SwiftGen/StencilSwiftKit/issues/48)
 
-## 1.0.2
-
 ### Bug Fixes
 
-* The context enrich function won't overwrite existing values in the `env` and `param` variables.  
-  [David Jennes](https://github.com/djbe)
-  [#29](https://github.com/SwiftGen/StencilSwiftKit/issues/29)
+* Fix `snakeToCamelCase` parameters information in README.  
+  [Liquidsoul](https://github.com/Liquidsoul)
+  [#45](https://github.com/SwiftGen/StencilSwiftKit/issues/45)
+
+## 1.0.2
 
 ### New Features
 
 * Added camelToSnakeCase filter.  
   [Gyuri Grell](https://github.com/ggrell)
   [#24](https://github.com/SwiftGen/StencilSwiftKit/pull/24)
 
+### Bug Fixes
+
+* The context enrich function won't overwrite existing values in the `env` and `param` variables.  
+  [David Jennes](https://github.com/djbe)
+  [#29](https://github.com/SwiftGen/StencilSwiftKit/issues/29)
+
 ### Internal Changes
 
 * Further refactor the Rakefile into rakelibs, and add a Gemfile for gem dependencies.  

rakelib/changelog.rake

@@ -14,15 +14,15 @@ namespace :changelog do
     <<-HEADER.gsub(/^\s*\|/, '')
       |## Master
       |
-      |### Bug Fixes
+      |### Breaking Changes
       |
       |_None_
       |
-      |### Breaking Changes
+      |### New Features
       |
       |_None_
       |
-      |### New Features
+      |### Bug Fixes
       |
       |_None_
       |