diff --git a/CHANGELOG.md b/CHANGELOG.md index bb248e15..d507640e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## dev branch / next version (1.x.x) +## version 1.2.0 (2018-11-12) + - **Breakin Change** replaced `emptyLines.beforeUsing` and `emptyLines.afterImportsUsing` settings with `emptyLines.importAndUsing` [#267](https://github.com/HaxeCheckstyle/haxe-formatter/issues/267) - Added `wrapping.opBoolChain` for wrapping `||` and `&&` chains [#248](https://github.com/HaxeCheckstyle/haxe-formatter/issues/248) - Added line count statistic for CLI [#249](https://github.com/HaxeCheckstyle/haxe-formatter/issues/249) diff --git a/haxelib.json b/haxelib.json index fc51fa7c..118460aa 100644 --- a/haxelib.json +++ b/haxelib.json @@ -8,8 +8,8 @@ "style" ], "description": "A code formatter for Haxe", - "version": "1.1.2", - "releasenote": "fixed an endless loop when using #if (macro) - see CHANGELOG for details.", + "version": "1.2.0", + "releasenote": "reworked indentation and empty lines options - see CHANGELOG for details.", "contributors": [ "AlexHaxe", "Gama11" diff --git a/package.json b/package.json index bb2b9be2..38323368 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haxe-formatter", - "version": "1.1.2", + "version": "1.2.0", "description": "A code formatter for Haxe", "repository": { "type": "git",