diff --git a/.github/workflows/checkstyle-linux.yml b/.github/workflows/checkstyle-linux.yml index 8ef72b0b..b6ff4ed0 100644 --- a/.github/workflows/checkstyle-linux.yml +++ b/.github/workflows/checkstyle-linux.yml @@ -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}} @@ -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 @@ -68,7 +68,7 @@ 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; \ @@ -76,5 +76,5 @@ jobs: ../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" diff --git a/.haxerc b/.haxerc index 0047672a..624d7ebf 100644 --- a/.haxerc +++ b/.haxerc @@ -1,4 +1,4 @@ { - "version": "4.0.2", + "version": "4.0.3", "resolveLibs": "scoped" } \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 7550bfff..120542dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e799642..3a8c4dbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) diff --git a/haxe3_libraries/tokentree.hxml b/haxe3_libraries/tokentree.hxml index df0d235d..88b49c61 100644 --- a/haxe3_libraries/tokentree.hxml +++ b/haxe3_libraries/tokentree.hxml @@ -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 diff --git a/haxe_libraries/tokentree.hxml b/haxe_libraries/tokentree.hxml index df0d235d..88b49c61 100644 --- a/haxe_libraries/tokentree.hxml +++ b/haxe_libraries/tokentree.hxml @@ -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 diff --git a/haxelib.json b/haxelib.json index 3f5b7336..30474865 100644 --- a/haxelib.json +++ b/haxelib.json @@ -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": {} } \ No newline at end of file diff --git a/makeReleaseZip.sh b/makeReleaseZip.sh index 989675ea..72bce20e 100755 --- a/makeReleaseZip.sh +++ b/makeReleaseZip.sh @@ -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 diff --git a/package.json b/package.json index 8cd6e667..4e58e3a6 100644 --- a/package.json +++ b/package.json @@ -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",