Skip to content

Commit b1f356d

Browse files
authored
fixed Haxe nightly compile errors (#505)
* fixed Haxe nightly compile errors * updated to Haxe 4.1.5
1 parent 89b00f2 commit b1f356d

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
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: ['4.0.5', '4.1.4', 'nightly']
18+
haxe-version: ['4.0.5', '4.1.5', '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.1.4'
29+
if: matrix.haxe-version == '4.1.5'
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
@@ -60,13 +60,13 @@ jobs:
6060
- name: Run Java tests
6161
run: npx haxe testJava.hxml
6262
- name: Format and upload codeclimate coverage
63-
if: success() && matrix.haxe-version == '4.1.4'
63+
if: success() && matrix.haxe-version == '4.1.5'
6464
run: |
6565
( \
6666
cd src; \
6767
../cc-test-reporter format-coverage -t lcov ../lcov.info; \
6868
../cc-test-reporter upload-coverage; \
6969
)
7070
- name: Upload results to codecov
71-
if: success() && (matrix.haxe-version == '4.1.4')
71+
if: success() && (matrix.haxe-version == '4.1.5')
7272
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.1.4",
2+
"version": "4.1.5",
33
"resolveLibs": "scoped"
44
}

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ install:
1616
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; chmod +x ./cc-test-reporter
1717
- npm install
1818
- if [[ "$HAXE_VERSION" == "haxe4" ]]; then npx lix download haxe 4.0.5; npx lix use haxe 4.0.5; fi
19-
- if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.4; npx lix use haxe 4.1.4; fi
19+
- if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.5; npx lix use haxe 4.1.5; fi
2020
- if [[ "$HAXE_VERSION" == "nightly" ]]; then npx lix download haxe nightly; npx lix use haxe nightly; fi
2121
- npx lix download
2222
- npx haxe -version

CHANGELOG.md

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

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

5+
- Fixed Haxe nightly compilation ([#505](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/505))
6+
- Updated to Haxe 4.1.5 ([#505](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/505))
7+
58
## version 2.7.0 (2020-12-23)
69

710
- **Breaking Change** replaced `EnforceVarTypeHint` with `VarTypeHint` check ([#500](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/500))

haxe_libraries/tokentree.hxml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# @install: lix --silent download "haxelib:/tokentree#1.1.0" into tokentree/1.1.0/haxelib
2-
-cp ${HAXE_LIBCACHE}/tokentree/1.1.0/haxelib/src
3-
-D tokentree=1.1.0
1+
# @install: lix --silent download "haxelib:/tokentree#1.1.1" into tokentree/1.1.1/haxelib
2+
-cp ${HAXE_LIBCACHE}/tokentree/1.1.1/haxelib/src
3+
-D tokentree=1.1.1

src/checkstyle/checks/whitespace/ExtendedEmptyLinesCheck.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ enum EmptyLinesFieldType {
707707
- inFunction = anywhere inside function body
708708
- typeDefinition = between type and left curly
709709
**/
710-
enum abstract EmptyLinesPlace(String) {
710+
enum abstract EmptyLinesPlace(String) to String {
711711
var BEFORE_PACKAGE = "beforePackage";
712712
var AFTER_PACKAGE = "afterPackage";
713713
var BETWEEN_IMPORTS = "betweenImports";

0 commit comments

Comments
 (0)