Skip to content

Commit

Permalink
prepare release 1.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexHaxe committed Mar 18, 2022
1 parent 5474f13 commit 0c6518d
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 30 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/formatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build:
strategy:
matrix:
haxe-version: ['4.0.5', '4.1.5', '4.2.4', 'nightly']
haxe-version: ['4.0.5', '4.1.5', '4.2.5', 'nightly']
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
Expand Down Expand Up @@ -72,5 +72,5 @@ jobs:
# name: formatter.js
# path: bin/formatter.js
- name: Upload results to codecov
if: success() && matrix.platform == 'ubuntu-latest' && (matrix.haxe-version == '4.2.4')
if: success() && matrix.platform == 'ubuntu-latest' && (matrix.haxe-version == '4.2.5')
run: bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
2 changes: 1 addition & 1 deletion .haxerc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "4.2.4",
"version": "2cbe1d0",
"resolveLibs": "scoped"
}
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

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

## version 1.13.0 (2022-03-18)

- Added default type parameter support, fixes [#650](https://github.com/HaxeCheckstyle/haxe-formatter/issues/650) ([#651](https://github.com/HaxeCheckstyle/haxe-formatter/issues/651))
- Added support for static locals ([#652](https://github.com/HaxeCheckstyle/haxe-formatter/issues/652))
- Fixed empty lines in anonymous functions, fixes [#644](https://github.com/HaxeCheckstyle/haxe-formatter/issues/644) ([#645](https://github.com/HaxeCheckstyle/haxe-formatter/issues/645))
- Fixed trailing whitespace getting moved to previous line, fixes [#646](https://github.com/HaxeCheckstyle/haxe-formatter/issues/646) ([#647](https://github.com/HaxeCheckstyle/haxe-formatter/issues/647))
- Fixed exclude handling ([#653](https://github.com/HaxeCheckstyle/haxe-formatter/issues/653))

## version 1.12.0 (2021-02-28)

Expand Down
4 changes: 2 additions & 2 deletions haxe_libraries/haxeparser.hxml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#e46103579c8c2676d8f544da53e8a1de9af87e21" into haxeparser/3.3.0/github/e46103579c8c2676d8f544da53e8a1de9af87e21
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#dace004f6aff39cf7cf3a9279da24f63b27de2af" into haxeparser/3.3.0/github/dace004f6aff39cf7cf3a9279da24f63b27de2af
-lib hxparse
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/e46103579c8c2676d8f544da53e8a1de9af87e21/src
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/dace004f6aff39cf7cf3a9279da24f63b27de2af/src
-D haxeparser=3.3.0
6 changes: 3 additions & 3 deletions haxe_libraries/instrument.hxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# @install: lix --silent download "gh://github.com/AlexHaxe/haxe-instrument#b61bdee34bf175e31b725306971d21105545ff89" into instrument/1.1.0/github/b61bdee34bf175e31b725306971d21105545ff89
# @install: lix --silent download "gh://github.com/AlexHaxe/haxe-instrument#9a687ac403cebdcde2d5326af2487d1dea88d66e" into instrument/1.1.1/github/9a687ac403cebdcde2d5326af2487d1dea88d66e
-lib safety
-cp ${HAXE_LIBCACHE}/instrument/1.1.0/github/b61bdee34bf175e31b725306971d21105545ff89/src
-D instrument=1.1.0
-cp ${HAXE_LIBCACHE}/instrument/1.1.1/github/9a687ac403cebdcde2d5326af2487d1dea88d66e/src
-D instrument=1.1.1
-lib safety
6 changes: 3 additions & 3 deletions haxe_libraries/json2object.hxml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @install: lix --silent download "gh://github.com/elnabo/json2object#a6845b4826151271dd34c69631ffda0886abd562" into json2object/3.8.1/github/a6845b4826151271dd34c69631ffda0886abd562
# @install: lix --silent download "haxelib:/json2object#3.10.0" into json2object/3.10.0/haxelib
-lib hxjsonast
-cp ${HAXE_LIBCACHE}/json2object/3.8.1/github/a6845b4826151271dd34c69631ffda0886abd562/src
-D json2object=3.8.1
-cp ${HAXE_LIBCACHE}/json2object/3.10.0/haxelib/src
-D json2object=3.10.0
6 changes: 3 additions & 3 deletions haxe_libraries/test-adapter.hxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# @install: lix --silent download "haxelib:/test-adapter#1.2.10" into test-adapter/1.2.10/haxelib
# @install: lix --silent download "haxelib:/test-adapter#2.0.1" into test-adapter/2.0.1/haxelib
-lib json2object
-cp ${HAXE_LIBCACHE}/test-adapter/1.2.10/haxelib/
-D test-adapter=1.2.10
-cp ${HAXE_LIBCACHE}/test-adapter/2.0.1/haxelib/
-D test-adapter=2.0.1
--macro _testadapter.Macro.init()
4 changes: 2 additions & 2 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#a91db0c834a63f371a6f3858f62a0f951be2bbcf" into tokentree/1.1.1/github/a91db0c834a63f371a6f3858f62a0f951be2bbcf
-cp ${HAXE_LIBCACHE}/tokentree/1.1.1/github/a91db0c834a63f371a6f3858f62a0f951be2bbcf/src
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#34216bcef43d521463a38ada480a1e993cd877a7" into tokentree/1.1.1/github/34216bcef43d521463a38ada480a1e993cd877a7
-cp ${HAXE_LIBCACHE}/tokentree/1.1.1/github/34216bcef43d521463a38ada480a1e993cd877a7/src
-D tokentree=1.1.1
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.12.0",
"releasenote": "added lineEnds.lineEndCharacter and bugfixes - see CHANGELOG for details.",
"version": "1.13.0",
"releasenote": "added default type parameter support and bugfixes - see CHANGELOG for details.",
"contributors": [
"AlexHaxe",
"Gama11"
Expand Down
2 changes: 1 addition & 1 deletion makeReleaseZip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

npm install
npx lix download
npx lix use haxe 4.1.5
npx lix use haxe nightly

npx haxe buildJsNode.hxml
npx haxe buildJsBrowser.hxml
Expand Down
18 changes: 9 additions & 9 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": "@haxecheckstyle/haxe-formatter",
"version": "1.12.0",
"version": "1.13.0",
"description": "A code formatter for Haxe",
"repository": {
"type": "git",
Expand All @@ -18,7 +18,7 @@
"license": "MIT",
"homepage": "https://github.com/HaxeCheckstyle/haxe-formatter#readme",
"devDependencies": {
"lix": "^15.11.6",
"lix": "^15.12.0",
"uglify-js-es6": "^2.8.9"
},
"bin": {
Expand Down

0 comments on commit 0c6518d

Please sign in to comment.