From 0a122b0debfe8521a2703d7593d4382181d26a80 Mon Sep 17 00:00:00 2001 From: AlexHaxe Date: Thu, 10 Oct 2019 22:24:56 +0200 Subject: [PATCH] prepare 2.5.0 (#477) * prepare 2.5.0 --- .travis.yml | 3 +++ CHANGELOG.md | 2 ++ buildCpp.hxml | 10 ++++++++++ haxelib.json | 6 +++--- package.json | 2 +- .../checkstyle/checks/modifier/InlineFinalCheckTest.hx | 4 ++-- .../checks/modifier/PublicAccessorCheckTest.hx | 6 ++++++ 7 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 buildCpp.hxml diff --git a/.travis.yml b/.travis.yml index 1692ae58..51c5a88d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ script: - haxe build.hxml - haxe buildDebug.hxml - haxe buildJS.hxml + - haxe buildCpp.hxml - haxe buildSchema.hxml - haxe -D codecov_json buildTest.hxml - haxe testJava.hxml @@ -26,6 +27,7 @@ matrix: - haxelib git mcover https://github.com/massiveinteractive/mcover master src - haxelib git munit https://github.com/massiveinteractive/MassiveUnit master src - haxelib install hxjava + - haxelib install hxcpp - haxelib install haxeparser 3.3.0 - haxelib install compiletime 2.6.0 - haxelib install hxargs 3.0.2 @@ -42,6 +44,7 @@ matrix: - haxelib git hxnodejs https://github.com/HaxeFoundation/hxnodejs.git master - haxelib git json2object https://github.com/elnabo/json2object - haxelib install hxjava + - haxelib install hxcpp - haxelib install mlib - haxelib install mconsole - haxelib install compiletime 2.6.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ee729f9..cb43de9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## dev branch / next version (2.x.x) +## version 2.5.0 (2019-10-10) + - **Breaking Change** split `OperatorWhitespaceCheck.functionArgPolicy` into `arrowFunctionPolicy`, `oldFunctionTypePolicy` and `newFunctionTypePolicy` [#467](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/467) - **Breaking Change** using `--` for long options in cli ([#472](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/472)) - New check BlockBreakingConditional ([#471](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/471)) diff --git a/buildCpp.hxml b/buildCpp.hxml new file mode 100644 index 00000000..7ed55374 --- /dev/null +++ b/buildCpp.hxml @@ -0,0 +1,10 @@ +buildGlobal.hxml +# -lib hxcpp-debugger +# -D HXCPP_DEBUGGER + +# -D HXCPP_STACK_TRACE +# -D HXCPP_STACK_LINE + +# -debug +-main checkstyle.Main +-cpp out \ No newline at end of file diff --git a/haxelib.json b/haxelib.json index e09c6891..3f5b7336 100644 --- a/haxelib.json +++ b/haxelib.json @@ -14,12 +14,12 @@ ], "description": "Automated code analysis ideal for projects that want to enforce a coding standard.", "contributors": [ - "adireddy", "AlexHaxe", + "adireddy", "Gama11" ], - "releasenote": "new checks for doc comments (type, field and style) and redundant @:access/@:allow metas - see CHANGELOG", - "version": "2.4.2", + "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", + "version": "2.5.0", "url": "https://github.com/HaxeCheckstyle/haxe-checkstyle", "dependencies": {} } \ No newline at end of file diff --git a/package.json b/package.json index fb363ec3..e3e7441b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haxe-checkstyle", - "version": "2.4.2", + "version": "2.5.0", "description": "Automated code analysis ideal for projects that want to enforce a coding standard.", "repository": { "type": "git", diff --git a/test/checkstyle/checks/modifier/InlineFinalCheckTest.hx b/test/checkstyle/checks/modifier/InlineFinalCheckTest.hx index 4fdd29f3..18f598e4 100644 --- a/test/checkstyle/checks/modifier/InlineFinalCheckTest.hx +++ b/test/checkstyle/checks/modifier/InlineFinalCheckTest.hx @@ -22,13 +22,13 @@ class InlineFinalCheckTest extends CheckTestCase { abstract InlineFinalCheckTests(String) to String { var TEST_INLINE_FINAL = " abstractAndClass Test { - public inline final test:String=0; + public inline final test:String='0'; final function test2() { } }"; var TEST_INLINE_VAR = " abstractAndClass Test { - inline public var test:String=0; + inline public var test:String='0'; inline function test2() { } }"; diff --git a/test/checkstyle/checks/modifier/PublicAccessorCheckTest.hx b/test/checkstyle/checks/modifier/PublicAccessorCheckTest.hx index f3c5b541..60b3756d 100644 --- a/test/checkstyle/checks/modifier/PublicAccessorCheckTest.hx +++ b/test/checkstyle/checks/modifier/PublicAccessorCheckTest.hx @@ -6,6 +6,7 @@ class PublicAccessorCheckTest extends CheckTestCase { @Test public function testNonAccessors() { assertNoMsg(new PublicAccessorCheck(), NON_ACCESSOR); + assertNoMsg(new PublicAccessorCheck(), PRIVATE_ACCESSOR); } @Test @@ -26,6 +27,11 @@ abstract PublicAccessorCheckTests(String) to String { public function _set_test() {} public function _get_test() {} }"; + var PRIVATE_ACCESSOR = " + abstractAndClass Test { + private function set_test() {} + private function get_test() {} + }"; var PUBLIC_GETTER = " abstractAndClass Test { public function get_test() {}