Skip to content

Commit

Permalink
prepare version 2.6.0 (#490)
Browse files Browse the repository at this point in the history
update tokentree lib
update to Haxe 4.0.3
  • Loading branch information
AlexHaxe authored Dec 1, 2019
1 parent 70ba493 commit e32c1e8
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/checkstyle-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
haxe-version: ['3.4.7', '4.0.2', 'nightly']
haxe-version: ['3.4.7', '4.0.3', 'nightly']
env:
CC_TEST_REPORTER_ID: 1dff6f89d7179dff5db635c6b4fe64acdd5694c9ed44d7da5f12f0f7d3d163b7
CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
Expand All @@ -26,7 +26,7 @@ jobs:
with:
node-version: 10
- name: Installing codeclimate client
if: matrix.haxe-version == '4.0.2'
if: matrix.haxe-version == '4.0.3'
run: |
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
Expand Down Expand Up @@ -68,13 +68,13 @@ jobs:
- name: Run Java tests
run: npx haxe testJava.hxml
- name: Format and upload codeclimate coverage
if: success() && matrix.haxe-version == '4.0.2'
if: success() && matrix.haxe-version == '4.0.3'
run: |
( \
cd src; \
../cc-test-reporter format-coverage -t lcov ../lcov.info; \
../cc-test-reporter upload-coverage; \
)
- name: Upload results to codecov
if: success() && matrix.haxe-version == '4.0.2'
if: success() && matrix.haxe-version == '4.0.3'
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.0.2",
"version": "4.0.3",
"resolveLibs": "scoped"
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install:
- npm install
- if [[ "$HAXE_VERSION" == "haxe347" ]]; then mv haxe_libraries haxe4_libraries; mv haxe3_libraries haxe_libraries; fi
- if [[ "$HAXE_VERSION" == "haxe347" ]]; then npx lix download haxe 3.4.7; npx lix use haxe 3.4.7; fi
- if [[ "$HAXE_VERSION" == "haxe4" ]]; then npx lix download haxe 4.0.2; npx lix use haxe 4.0.2; fi
- if [[ "$HAXE_VERSION" == "haxe4" ]]; then npx lix download haxe 4.0.3; npx lix use haxe 4.0.3; fi
- if [[ "$HAXE_VERSION" == "nightly" ]]; then npx lix download haxe nightly; npx lix use haxe nightly; fi
- npx lix download
- npx haxe -version
Expand Down
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 (2.x.x)

## version 2.6.0 (2019-12-01)

- **Breaking Change** changed `MethodLength.countEmpty` into `ignoreEmptyLines` ([#486](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/486))
- New check `CodeSimilarity` to check for similar or identical code blocks ([#479](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/479) + [#480](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/480) + [#484](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/484) + [#486](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/486) + [#488](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/488))
- New check `EnforceVarTypeHint` to enforce type hints for all variables and finals, fixes [#464](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/464) ([#481](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/481) + [#482](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/482))
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 @@
-D tokentree=1.0.23
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#3b66fcf61e55178e75c01168a58c0cdece198e48" into tokentree/1.0.23/github/3b66fcf61e55178e75c01168a58c0cdece198e48
-cp ${HAXE_LIBCACHE}/tokentree/1.0.23/github/3b66fcf61e55178e75c01168a58c0cdece198e48/src
-D tokentree=1.0.24
# @install: lix --silent download "haxelib:/tokentree#1.0.24" into tokentree/1.0.24/haxelib
-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/haxelib/src
6 changes: 3 additions & 3 deletions haxe_libraries/tokentree.hxml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-D tokentree=1.0.23
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#3b66fcf61e55178e75c01168a58c0cdece198e48" into tokentree/1.0.23/github/3b66fcf61e55178e75c01168a58c0cdece198e48
-cp ${HAXE_LIBCACHE}/tokentree/1.0.23/github/3b66fcf61e55178e75c01168a58c0cdece198e48/src
-D tokentree=1.0.24
# @install: lix --silent download "haxelib:/tokentree#1.0.24" into tokentree/1.0.24/haxelib
-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/haxelib/src
6 changes: 3 additions & 3 deletions haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"AlexHaxe",
"adireddy",
"Gama11"
],
"releasenote": "breaking changes: command line options and OperatorWhitespace settings changed, new checks InlineFinal and BlockBreakingConditional, increased Haxe 4 compatibility, some formatter related fixes and a few bugfixes - see CHANGELOG",
"version": "2.5.0",
],
"releasenote": "breaking changes: MethodLength settings changed, new checks CodeSimilarity, EnforceVarTypeHint, AvoidIdentifier, ArrowFunction and NestedControlFlow, some Haxe 4 fixes and a few bugfixes - see CHANGELOG",
"version": "2.6.0",
"url": "https://github.com/HaxeCheckstyle/haxe-checkstyle",
"dependencies": {}
}
4 changes: 2 additions & 2 deletions makeReleaseZip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

npm install
npx lix download
npx lix use haxe 4.0.0-rc.5
npx lix use haxe 4.0.3

npx haxe buildAll.hxml

rm -f haxe-checkstyle.zip
zip -9 -r -q haxe-checkstyle.zip src run.n haxecheckstyle.js resources/sample-config.json resources/logo.png resources/codeclimate_pr.png haxelib.json README.md CHANGELOG.md LICENSE.md
zip -9 -r -q haxe-checkstyle.zip src run.n haxecheckstyle.js resources/sample-config.json resources/logo.png resources/codeclimate_pr.png haxelib.json hxformat.json package.json README.md CHANGELOG.md LICENSE.md
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "haxe-checkstyle",
"version": "2.5.0",
"version": "2.6.0",
"description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
"repository": {
"type": "git",
Expand Down

0 comments on commit e32c1e8

Please sign in to comment.