From 1f8f0ae9245cbd7a486da0c72f6f03d618d3a34e Mon Sep 17 00:00:00 2001 From: AlexHaxe Date: Wed, 24 Aug 2022 22:56:23 +0200 Subject: [PATCH] prepare 2.8.0 release --- .github/workflows/checkstyle-linux.yml | 15 ++++++++------- .haxerc | 2 +- CHANGELOG.md | 2 ++ haxe_libraries/json2object.hxml | 6 +++--- haxe_libraries/test-adapter.hxml | 6 +++--- haxe_libraries/tokentree.hxml | 6 +++--- haxelib.json | 4 ++-- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- 9 files changed, 33 insertions(+), 30 deletions(-) diff --git a/.github/workflows/checkstyle-linux.yml b/.github/workflows/checkstyle-linux.yml index f416e97d..f6e0251c 100644 --- a/.github/workflows/checkstyle-linux.yml +++ b/.github/workflows/checkstyle-linux.yml @@ -15,18 +15,18 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - haxe-version: ['4.1.5', '4.2.4', 'nightly'] + haxe-version: ['4.1.5', '4.2.5', 'nightly'] env: CC_TEST_REPORTER_ID: c4eda639526d39fbcab7ab9fc68c4046d4e597df56dbcb552b42d27b3580b758 CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} steps: - uses: actions/checkout@v1 - - name: Use Node.js 10 + - name: Use Node.js 12 uses: actions/setup-node@v1 with: - node-version: 10 + node-version: 12 - name: Installing codeclimate client - if: matrix.haxe-version == '4.2.4' + if: matrix.haxe-version == '4.2.5' run: | curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter chmod +x ./cc-test-reporter @@ -51,7 +51,6 @@ jobs: - name: Build NodeJs version run: npx haxe buildJS.hxml - name: Build C++ version - if: matrix.haxe-version != 'nightly' run: echo "y" | npx haxe buildCpp.hxml - name: Build JSON schema run: npx haxe buildSchema.hxml @@ -59,8 +58,10 @@ jobs: run: npx haxe -D codecov_json testAndResources.hxml - name: Run Java tests run: npx haxe testJava.hxml + - name: Run JVM tests + run: npx haxe testJvm.hxml - name: Format and upload codeclimate coverage - if: success() && matrix.haxe-version == '4.2.4' + if: success() && matrix.haxe-version == '4.2.5' run: | ( \ cd src; \ @@ -68,5 +69,5 @@ jobs: ../cc-test-reporter upload-coverage; \ ) - name: Upload results to codecov - if: success() && (matrix.haxe-version == '4.2.4') + if: success() && (matrix.haxe-version == '4.2.5') run: bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" diff --git a/.haxerc b/.haxerc index f383ce48..71405466 100644 --- a/.haxerc +++ b/.haxerc @@ -1,4 +1,4 @@ { - "version": "4.2.4", + "version": "4.2.5", "resolveLibs": "scoped" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d71a609a..bfeaa76b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## dev branch / next version (2.x.x) +## version 2.8.0 (2022-08-24) + - New check `CommentedOutCode` to check comments for commented out code fragments ([#512](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/512)) - Fixed Haxe nightly compilation ([#505](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/505)) - Added related messages to reporters for `CodeSimilarity` check ([#506](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/506)) diff --git a/haxe_libraries/json2object.hxml b/haxe_libraries/json2object.hxml index 14b0b70e..0b817063 100644 --- a/haxe_libraries/json2object.hxml +++ b/haxe_libraries/json2object.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "gh://github.com/elnabo/json2object#a6845b4826151271dd34c69631ffda0886abd562" into json2object/3.8.1/github/a6845b4826151271dd34c69631ffda0886abd562 +# @install: lix --silent download "haxelib:/json2object#3.10.0" into json2object/3.10.0/haxelib -lib hxjsonast --cp ${HAXE_LIBCACHE}/json2object/3.8.1/github/a6845b4826151271dd34c69631ffda0886abd562/src --D json2object=3.8.1 \ No newline at end of file +-cp ${HAXE_LIBCACHE}/json2object/3.10.0/haxelib/src +-D json2object=3.10.0 \ No newline at end of file diff --git a/haxe_libraries/test-adapter.hxml b/haxe_libraries/test-adapter.hxml index a47a7c88..a50777cb 100644 --- a/haxe_libraries/test-adapter.hxml +++ b/haxe_libraries/test-adapter.hxml @@ -1,5 +1,5 @@ --D test-adapter=1.2.6 -# @install: lix --silent download "haxelib:/test-adapter#1.2.6" into test-adapter/1.2.6/haxelib +# @install: lix --silent download "haxelib:/test-adapter#2.0.1" into test-adapter/2.0.1/haxelib -lib json2object --cp ${HAXE_LIBCACHE}/test-adapter/1.2.6/haxelib/ +-cp ${HAXE_LIBCACHE}/test-adapter/2.0.1/haxelib/ +-D test-adapter=2.0.1 --macro _testadapter.Macro.init() \ No newline at end of file diff --git a/haxe_libraries/tokentree.hxml b/haxe_libraries/tokentree.hxml index ef800fb3..ea3e15c4 100644 --- a/haxe_libraries/tokentree.hxml +++ b/haxe_libraries/tokentree.hxml @@ -1,3 +1,3 @@ -# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#34216bcef43d521463a38ada480a1e993cd877a7" into tokentree/1.1.1/github/34216bcef43d521463a38ada480a1e993cd877a7 --cp ${HAXE_LIBCACHE}/tokentree/1.1.1/github/34216bcef43d521463a38ada480a1e993cd877a7/src --D tokentree=1.1.1 \ No newline at end of file +# @install: lix --silent download "haxelib:/tokentree#1.1.2" into tokentree/1.1.2/haxelib +-cp ${HAXE_LIBCACHE}/tokentree/1.1.2/haxelib/src +-D tokentree=1.1.2 \ No newline at end of file diff --git a/haxelib.json b/haxelib.json index fa748c7f..74b081ca 100644 --- a/haxelib.json +++ b/haxelib.json @@ -18,8 +18,8 @@ "adireddy", "Gama11" ], - "releasenote": "breaking change: EnforceVarTypeHint renamed to VarTypeHint - see CHANGELOG", - "version": "2.7.0", + "releasenote": "added CommentedOutCode check - see CHANGELOG", + "version": "2.8.0", "url": "https://github.com/HaxeCheckstyle/haxe-checkstyle", "dependencies": {} } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index adc037b8..d31b970e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,24 +1,24 @@ { "name": "@haxecheckstyle/haxe-checkstyle", - "version": "2.7.0", + "version": "2.8.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@haxecheckstyle/haxe-checkstyle", - "version": "2.7.0", + "version": "2.8.0", "license": "MIT", "bin": { "haxe-checkstyle": "bin/checkstyle.js" }, "devDependencies": { - "lix": "^15.11.6" + "lix": "^15.12.0" } }, "node_modules/lix": { - "version": "15.11.6", - "resolved": "https://registry.npmjs.org/lix/-/lix-15.11.6.tgz", - "integrity": "sha512-JyD3/sCeYz07HqUgyeTj6n6SfuVmUFBA0+0Q6PhoqN9bD3blUrfJ1XcX9VOhaUlH4qIbHe+NygK+fNvi+o4pEA==", + "version": "15.12.0", + "resolved": "https://registry.npmjs.org/lix/-/lix-15.12.0.tgz", + "integrity": "sha512-FA36oCl+M+3Of8L4eErXw7tAHGOjqEC4IgEvH6oPDsiYd4yN6XpzZGcbLuIyu4PiztjOrr1TKJnpwi32qb2ddw==", "dev": true, "hasInstallScript": true, "bin": { @@ -31,9 +31,9 @@ }, "dependencies": { "lix": { - "version": "15.11.6", - "resolved": "https://registry.npmjs.org/lix/-/lix-15.11.6.tgz", - "integrity": "sha512-JyD3/sCeYz07HqUgyeTj6n6SfuVmUFBA0+0Q6PhoqN9bD3blUrfJ1XcX9VOhaUlH4qIbHe+NygK+fNvi+o4pEA==", + "version": "15.12.0", + "resolved": "https://registry.npmjs.org/lix/-/lix-15.12.0.tgz", + "integrity": "sha512-FA36oCl+M+3Of8L4eErXw7tAHGOjqEC4IgEvH6oPDsiYd4yN6XpzZGcbLuIyu4PiztjOrr1TKJnpwi32qb2ddw==", "dev": true } } diff --git a/package.json b/package.json index 4487da5f..6be540b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@haxecheckstyle/haxe-checkstyle", - "version": "2.7.0", + "version": "2.8.0", "description": "Automated code analysis ideal for projects that want to enforce a coding standard.", "repository": { "type": "git", @@ -29,7 +29,7 @@ } ], "devDependencies": { - "lix": "^15.11.6" + "lix": "^15.12.0" }, "bugs": "https://github.com/HaxeCheckstyle/haxe-checkstyle/issues", "license": "MIT",