retired Haxe 3 compilation support (#502)

* retired Haxe 3 compilation support
* updated haxeparser, tokentree, json2object and munit libs

Author: AlexHaxe

.github/workflows/checkstyle-linux.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        haxe-version: ['3.4.7', '4.0.5', '4.1.2']
+        haxe-version: ['4.0.5', '4.1.4', '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.1.2'
+      if: matrix.haxe-version == '4.1.4'
       run: |
         curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
         chmod +x ./cc-test-reporter
@@ -37,11 +37,6 @@ jobs:
       run: |
         npx lix download haxe ${{ matrix.haxe-version }}
         npx lix use haxe ${{ matrix.haxe-version }}
-    - name: Prepare Haxe 3 dependencies
-      if: matrix.haxe-version == '3.4.7'
-      run: |
-        mv haxe_libraries haxe4_libraries
-        mv haxe3_libraries haxe_libraries
     - name: Run lix download
       run: npx lix download
     - name: Print versions
@@ -60,25 +55,18 @@ jobs:
       run: echo "y" | npx haxe buildCpp.hxml
     - name: Build JSON schema
       run: npx haxe buildSchema.hxml
-    - name: Run neko tests
-      if: matrix.haxe-version == '3.4.7'
-      run: npx haxe -D codecov_json testAndResources.hxml
     - name: Run eval tests
-      if: matrix.haxe-version != '3.4.7'
       run: npx haxe -D codecov_json testAndResources.hxml
     - name: Run Java tests
       run: npx haxe testJava.hxml
-    - name: Run Jvm tests
-      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.2'
+      if: success() && matrix.haxe-version == '4.1.4'
       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.2')
+      if: success() && (matrix.haxe-version == '4.1.4')
       run: bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"

.haxerc

@@ -1,4 +1,4 @@
 {
-  "version": "4.1.2",
+  "version": "4.1.4",
   "resolveLibs": "scoped"
 }

.travis.yml

@@ -8,18 +8,15 @@ env:
   global:
     - CC_TEST_REPORTER_ID=1dff6f89d7179dff5db635c6b4fe64acdd5694c9ed44d7da5f12f0f7d3d163b7
   matrix:
-    - HAXE_VERSION=haxe347
     - HAXE_VERSION=haxe4
     - HAXE_VERSION=haxe41
     - HAXE_VERSION=nightly
 
 install:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; chmod +x ./cc-test-reporter
   - 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.5; npx lix use haxe 4.0.5; fi
-  - if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.2; npx lix use haxe 4.1.2; fi
+  - if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.4; npx lix use haxe 4.1.4; fi
   - if [[ "$HAXE_VERSION" == "nightly" ]]; then npx lix download haxe nightly; npx lix use haxe nightly; fi
   - npx lix download
   - npx haxe -version
@@ -37,7 +34,6 @@ script:
   - npx haxe buildSchema.hxml
   - npx haxe -D codecov_json testAndResources.hxml
   - npx haxe testJava.hxml
-  - if [[ "$HAXE_VERSION" != "haxe347" ]]; then npx haxe testJvm.hxml; fi
   - (cd src; ../cc-test-reporter format-coverage -t lcov ../lcov.info)
 
 after_script:

CHANGELOG.md

@@ -7,6 +7,8 @@
 - 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) + [#501](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/501))
+- Updated haxeparser lib with latest syntax changes ([#502](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/502))
+- Retired Haxe 3.4.7 compile support ([#502](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/502))
 
 ## version 2.6.1 (2019-12-17)
 

build/Build.hx

@@ -16,9 +16,7 @@ class Build {
 		callLix("buildSchema.hxml", "Json schema");
 		callLix("testAndResources.hxml", "Unittests neko / eval + generate resoucres");
 		callLix("testJava.hxml", "Unittests Java");
-		#if haxe4
 		callLix("testJvm.hxml", "Unittests Jvm");
-		#end
 		Sys.exit(exitCode);
 	}
 

buildJS.hxml

@@ -1,4 +1,6 @@
 build/common.hxml
 -lib hxnodejs
 -main checkstyle.Main
--js haxecheckstyle.js
+-js haxecheckstyle.js
+
+-cmd mkdir -p bin && cp haxecheckstyle.js bin/checkstyle.js