Skip to content

Commit

Permalink
added support for inline markup (#513)
Browse files Browse the repository at this point in the history
* added support for inline markup
* retired Haxe 4.1.5 compilation support
  • Loading branch information
AlexHaxe authored Sep 7, 2022
1 parent 1f8f0ae commit 3f39ea7
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .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: ['4.1.5', '4.2.5', 'nightly']
haxe-version: ['4.2.5', 'nightly']
env:
CC_TEST_REPORTER_ID: c4eda639526d39fbcab7ab9fc68c4046d4e597df56dbcb552b42d27b3580b758
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .haxerc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "4.2.5",
"version": "779b005",
"resolveLibs": "scoped"
}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

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

## version 2.8.1 (2022-09-07)

- Added support for inline markup ([#513](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/513))
- Retired Haxe 4.1.5 compile support ([#513](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/513))

## 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))
Expand Down
4 changes: 2 additions & 2 deletions haxe_libraries/haxeparser.hxml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#dace004f6aff39cf7cf3a9279da24f63b27de2af" into haxeparser/3.3.0/github/dace004f6aff39cf7cf3a9279da24f63b27de2af
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#1ea2a8915956ac3af6f1a11c67e0e56261b75929" into haxeparser/3.3.0/github/1ea2a8915956ac3af6f1a11c67e0e56261b75929
-lib hxparse
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/dace004f6aff39cf7cf3a9279da24f63b27de2af/src
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/1ea2a8915956ac3af6f1a11c67e0e56261b75929/src
-D haxeparser=3.3.0
6 changes: 3 additions & 3 deletions haxe_libraries/hxjsonast.hxml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @install: lix --silent download "haxelib:/hxjsonast#1.0.1" into hxjsonast/1.0.1/haxelib
-cp ${HAXE_LIBCACHE}/hxjsonast/1.0.1/haxelib/src
-D hxjsonast=1.0.1
# @install: lix --silent download "haxelib:/hxjsonast#1.1.0" into hxjsonast/1.1.0/haxelib
-cp ${HAXE_LIBCACHE}/hxjsonast/1.1.0/haxelib/src
-D hxjsonast=1.1.0
6 changes: 3 additions & 3 deletions haxe_libraries/test-adapter.hxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# @install: lix --silent download "haxelib:/test-adapter#2.0.1" into test-adapter/2.0.1/haxelib
# @install: lix --silent download "haxelib:/test-adapter#2.0.4" into test-adapter/2.0.4/haxelib
-lib json2object
-cp ${HAXE_LIBCACHE}/test-adapter/2.0.1/haxelib/
-D test-adapter=2.0.1
-cp ${HAXE_LIBCACHE}/test-adapter/2.0.4/haxelib/
-D test-adapter=2.0.4
--macro _testadapter.Macro.init()
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 "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
# @install: lix --silent download "haxelib:/tokentree#1.2.1" into tokentree/1.2.1/haxelib
-cp ${HAXE_LIBCACHE}/tokentree/1.2.1/haxelib/src
-D tokentree=1.2.1
4 changes: 2 additions & 2 deletions haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"adireddy",
"Gama11"
],
"releasenote": "added CommentedOutCode check - see CHANGELOG",
"version": "2.8.0",
"releasenote": "added support for inline markup - see CHANGELOG",
"version": "2.8.1",
"url": "https://github.com/HaxeCheckstyle/haxe-checkstyle",
"dependencies": {}
}
2 changes: 1 addition & 1 deletion makeReleaseZip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

npm install
npx lix download
npx lix use haxe 4.1.4
npx lix use haxe nightly

npx haxe buildAll.hxml

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@haxecheckstyle/haxe-checkstyle",
"version": "2.8.0",
"version": "2.8.1",
"description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
"repository": {
"type": "git",
Expand Down

0 comments on commit 3f39ea7

Please sign in to comment.