Skip to content

Commit

Permalink
prepare version 1.10.0 (#575)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexHaxe authored Apr 11, 2020
1 parent fb3a10a commit 6d311ce
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## dev branch / next version (1.x.x)

## version 1.10.0 (2020-04-11)

- Added `lineEnds.anonFunctionCurly`, fixes [#538](https://github.com/HaxeCheckstyle/haxe-formatter/issues/538) ([#549](https://github.com/HaxeCheckstyle/haxe-formatter/issues/549))
- Added detection for and skipping files with merge conflicts, fixes [#558](https://github.com/HaxeCheckstyle/haxe-formatter/issues/558) ([#559](https://github.com/HaxeCheckstyle/haxe-formatter/issues/559))
- Added case pattern wrapping with `wrapping.casePattern`, fixes [#359](https://github.com/HaxeCheckstyle/haxe-formatter/issues/359) ([#566](https://github.com/HaxeCheckstyle/haxe-formatter/issues/566))
Expand Down
6 changes: 3 additions & 3 deletions haxe3_libraries/tokentree.hxml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#98ccf0f4df9347f882ac2457b804875207d66d1a" into tokentree/1.0.24/github/98ccf0f4df9347f882ac2457b804875207d66d1a
-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/github/98ccf0f4df9347f882ac2457b804875207d66d1a/src
-D tokentree=1.0.24
# @install: lix --silent download "haxelib:/tokentree#1.0.25" into tokentree/1.0.25/haxelib
-cp ${HAXE_LIBCACHE}/tokentree/1.0.25/haxelib/src
-D tokentree=1.0.25
6 changes: 3 additions & 3 deletions haxe_libraries/tokentree.hxml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#98ccf0f4df9347f882ac2457b804875207d66d1a" into tokentree/1.0.24/github/98ccf0f4df9347f882ac2457b804875207d66d1a
-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/github/98ccf0f4df9347f882ac2457b804875207d66d1a/src
-D tokentree=1.0.24
# @install: lix --silent download "haxelib:/tokentree#1.0.25" into tokentree/1.0.25/haxelib
-cp ${HAXE_LIBCACHE}/tokentree/1.0.25/haxelib/src
-D tokentree=1.0.25
4 changes: 2 additions & 2 deletions haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"style"
],
"description": "A code formatter for Haxe",
"version": "1.9.2",
"releasenote": "Fixed whitespace issues and changed build system to lix - see CHANGELOG for details.",
"version": "1.10.0",
"releasenote": "added case pattern wrapping, merge conflict file detection and various bugfixes - see CHANGELOG for details.",
"contributors": [
"AlexHaxe",
"Gama11"
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "haxe-formatter",
"version": "1.9.2",
"version": "1.10.0",
"description": "A code formatter for Haxe",
"repository": {
"type": "git",
Expand All @@ -15,7 +15,7 @@
"email": "[email protected]"
},
"devDependencies": {
"lix": "^15.8.9"
"lix": "^15.8.11"
},
"bugs": "https://github.com/HaxeCheckstyle/haxe-formatter/issues",
"license": "MIT"
Expand Down

0 comments on commit 6d311ce

Please sign in to comment.