Skip to content

Commit e32c1e8

Browse files
authored
prepare version 2.6.0 (#490)
update tokentree lib update to Haxe 4.0.3
1 parent 70ba493 commit e32c1e8

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

.github/workflows/checkstyle-linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
haxe-version: ['3.4.7', '4.0.2', 'nightly']
18+
haxe-version: ['3.4.7', '4.0.3', 'nightly']
1919
env:
2020
CC_TEST_REPORTER_ID: 1dff6f89d7179dff5db635c6b4fe64acdd5694c9ed44d7da5f12f0f7d3d163b7
2121
CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
node-version: 10
2828
- name: Installing codeclimate client
29-
if: matrix.haxe-version == '4.0.2'
29+
if: matrix.haxe-version == '4.0.3'
3030
run: |
3131
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
3232
chmod +x ./cc-test-reporter
@@ -68,13 +68,13 @@ jobs:
6868
- name: Run Java tests
6969
run: npx haxe testJava.hxml
7070
- name: Format and upload codeclimate coverage
71-
if: success() && matrix.haxe-version == '4.0.2'
71+
if: success() && matrix.haxe-version == '4.0.3'
7272
run: |
7373
( \
7474
cd src; \
7575
../cc-test-reporter format-coverage -t lcov ../lcov.info; \
7676
../cc-test-reporter upload-coverage; \
7777
)
7878
- name: Upload results to codecov
79-
if: success() && matrix.haxe-version == '4.0.2'
79+
if: success() && matrix.haxe-version == '4.0.3'
8080
run: bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"

.haxerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "4.0.2",
2+
"version": "4.0.3",
33
"resolveLibs": "scoped"
44
}

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ install:
1717
- npm install
1818
- if [[ "$HAXE_VERSION" == "haxe347" ]]; then mv haxe_libraries haxe4_libraries; mv haxe3_libraries haxe_libraries; fi
1919
- if [[ "$HAXE_VERSION" == "haxe347" ]]; then npx lix download haxe 3.4.7; npx lix use haxe 3.4.7; fi
20-
- if [[ "$HAXE_VERSION" == "haxe4" ]]; then npx lix download haxe 4.0.2; npx lix use haxe 4.0.2; fi
20+
- if [[ "$HAXE_VERSION" == "haxe4" ]]; then npx lix download haxe 4.0.3; npx lix use haxe 4.0.3; fi
2121
- if [[ "$HAXE_VERSION" == "nightly" ]]; then npx lix download haxe nightly; npx lix use haxe nightly; fi
2222
- npx lix download
2323
- npx haxe -version

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 (2.x.x)
44

5+
## version 2.6.0 (2019-12-01)
6+
57
- **Breaking Change** changed `MethodLength.countEmpty` into `ignoreEmptyLines` ([#486](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/486))
68
- 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))
79
- 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))

haxe3_libraries/tokentree.hxml

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

haxe_libraries/tokentree.hxml

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

haxelib.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"AlexHaxe",
1818
"adireddy",
1919
"Gama11"
20-
],
21-
"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",
22-
"version": "2.5.0",
20+
],
21+
"releasenote": "breaking changes: MethodLength settings changed, new checks CodeSimilarity, EnforceVarTypeHint, AvoidIdentifier, ArrowFunction and NestedControlFlow, some Haxe 4 fixes and a few bugfixes - see CHANGELOG",
22+
"version": "2.6.0",
2323
"url": "https://github.com/HaxeCheckstyle/haxe-checkstyle",
2424
"dependencies": {}
2525
}

makeReleaseZip.sh

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

33
npm install
44
npx lix download
5-
npx lix use haxe 4.0.0-rc.5
5+
npx lix use haxe 4.0.3
66

77
npx haxe buildAll.hxml
88

99
rm -f haxe-checkstyle.zip
10-
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
10+
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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "haxe-checkstyle",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)