Skip to content

Commit 6d311ce

Browse files
authored
prepare version 1.10.0 (#575)
1 parent fb3a10a commit 6d311ce

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

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

5+
## version 1.10.0 (2020-04-11)
6+
57
- Added `lineEnds.anonFunctionCurly`, fixes [#538](https://github.com/HaxeCheckstyle/haxe-formatter/issues/538) ([#549](https://github.com/HaxeCheckstyle/haxe-formatter/issues/549))
68
- 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))
79
- 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))

haxe3_libraries/tokentree.hxml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#98ccf0f4df9347f882ac2457b804875207d66d1a" into tokentree/1.0.24/github/98ccf0f4df9347f882ac2457b804875207d66d1a
2-
-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/github/98ccf0f4df9347f882ac2457b804875207d66d1a/src
3-
-D tokentree=1.0.24
1+
# @install: lix --silent download "haxelib:/tokentree#1.0.25" into tokentree/1.0.25/haxelib
2+
-cp ${HAXE_LIBCACHE}/tokentree/1.0.25/haxelib/src
3+
-D tokentree=1.0.25

haxe_libraries/tokentree.hxml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#98ccf0f4df9347f882ac2457b804875207d66d1a" into tokentree/1.0.24/github/98ccf0f4df9347f882ac2457b804875207d66d1a
2-
-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/github/98ccf0f4df9347f882ac2457b804875207d66d1a/src
3-
-D tokentree=1.0.24
1+
# @install: lix --silent download "haxelib:/tokentree#1.0.25" into tokentree/1.0.25/haxelib
2+
-cp ${HAXE_LIBCACHE}/tokentree/1.0.25/haxelib/src
3+
-D tokentree=1.0.25

haxelib.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"style"
99
],
1010
"description": "A code formatter for Haxe",
11-
"version": "1.9.2",
12-
"releasenote": "Fixed whitespace issues and changed build system to lix - see CHANGELOG for details.",
11+
"version": "1.10.0",
12+
"releasenote": "added case pattern wrapping, merge conflict file detection and various bugfixes - see CHANGELOG for details.",
1313
"contributors": [
1414
"AlexHaxe",
1515
"Gama11"

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "haxe-formatter",
3-
"version": "1.9.2",
3+
"version": "1.10.0",
44
"description": "A code formatter for Haxe",
55
"repository": {
66
"type": "git",
@@ -15,7 +15,7 @@
1515
"email": "[email protected]"
1616
},
1717
"devDependencies": {
18-
"lix": "^15.8.9"
18+
"lix": "^15.8.11"
1919
},
2020
"bugs": "https://github.com/HaxeCheckstyle/haxe-formatter/issues",
2121
"license": "MIT"

0 commit comments

Comments
 (0)