Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Var hint #500

Merged
merged 10 commits into from
Jun 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.5', '4.1.1', 'nightly']
haxe-version: ['3.4.7', '4.0.5', '4.1.2', '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.1.1'
if: matrix.haxe-version == '4.1.2'
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 @@ -72,13 +72,13 @@ jobs:
if: matrix.haxe-version != '3.4.7'
run: npx haxe testJvm.hxml
- name: Format and upload codeclimate coverage
if: success() && matrix.haxe-version == '4.1.1'
if: success() && matrix.haxe-version == '4.1.2'
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 == '3.4.7' || matrix.haxe-version == '4.1.1')
if: success() && (matrix.haxe-version == '3.4.7' || matrix.haxe-version == '4.1.2')
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.1.1",
"version": "4.1.2",
"resolveLibs": "scoped"
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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.5; npx lix use haxe 4.0.5; fi
- if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.1; npx lix use haxe 4.1.1; fi
- if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.2; npx lix use haxe 4.1.2; 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,9 +2,11 @@

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

- **Breaking Change** replaced `EnforceVarTypeHint` with `VarTypeHint` check ([#500](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/500))
- Added support for final in `MagicNumber`, fixes [#494](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/494) ([#495](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/495))
- Fixed handling `OBJECT_DECL` token in `RightCurly`, fixes [#496](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/496) ([#497](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/497))
- Reorganised build files ([#498](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/498))
- Refactored for tokentree API change ([#500](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/500))

## version 2.6.1 (2019-12-17)

Expand Down
9 changes: 0 additions & 9 deletions checkstyle.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,6 @@
},
"type": "HiddenField"
},
{
"type": "Indentation"
},
{
"props": {
"character": "tab"
},
"type": "IndentationCharacter"
},
{
"type": "InnerAssignment"
},
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#119c4cefa927018472cd57f5de1063d43f00da95" into tokentree/1.0.24/github/119c4cefa927018472cd57f5de1063d43f00da95
-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/github/119c4cefa927018472cd57f5de1063d43f00da95/src
-D tokentree=1.0.24
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#7bada801831488a3bed105838c263ec819c69dfb" into tokentree/1.0.28/github/7bada801831488a3bed105838c263ec819c69dfb
-cp ${HAXE_LIBCACHE}/tokentree/1.0.28/github/7bada801831488a3bed105838c263ec819c69dfb/src
-D tokentree=1.0.28
6 changes: 3 additions & 3 deletions haxe_libraries/haxeparser.hxml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-D haxeparser=3.3.0
# @install: lix --silent download "gh://github.com/Simn/haxeparser#e5746bfc55c09a3694db42738ff575b91441971a" into haxeparser/3.3.0/github/e5746bfc55c09a3694db42738ff575b91441971a
# @install: lix --silent download "gh://github.com/simn/haxeparser#00b509e8690300ca6366aa8d0d4d97bd29fbcf2b" into haxeparser/3.3.0/github/00b509e8690300ca6366aa8d0d4d97bd29fbcf2b
-lib hxparse
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/e5746bfc55c09a3694db42738ff575b91441971a/src
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/00b509e8690300ca6366aa8d0d4d97bd29fbcf2b/src
-D haxeparser=3.3.0
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#119c4cefa927018472cd57f5de1063d43f00da95" into tokentree/1.0.24/github/119c4cefa927018472cd57f5de1063d43f00da95
-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/github/119c4cefa927018472cd57f5de1063d43f00da95/src
-D tokentree=1.0.24
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#7bada801831488a3bed105838c263ec819c69dfb" into tokentree/1.0.28/github/7bada801831488a3bed105838c263ec819c69dfb
-cp ${HAXE_LIBCACHE}/tokentree/1.0.28/github/7bada801831488a3bed105838c263ec819c69dfb/src
-D tokentree=1.0.28
Loading