From 51a30d4c6b78b449ac5b5d6561009d920e31595f Mon Sep 17 00:00:00 2001 From: AlexHaxe Date: Mon, 4 Mar 2019 13:56:30 +0100 Subject: [PATCH] prepare version 1.0.16 (#144) * prepare version 1.0.16 * cleanup dependencies --- CHANGELOG.md | 2 ++ buildToken.hxml | 3 +-- gruntfile.js | 6 ++---- haxelib.json | 2 +- package.json | 4 ++-- test.hxml | 2 -- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a26dee6..c7aa43c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## dev branch / next version (1.x.x) +## version 1.0.16 (2019-03-04) + - Added `TokenTreeCheckUtils.isMetadata` [#143](https://github.com/HaxeCheckstyle/tokentree/issues/143) - Fixed handling of OpBool after `null` [#140](https://github.com/HaxeCheckstyle/tokentree/issues/140) - Fixed comments before `catch` [#140](https://github.com/HaxeCheckstyle/tokentree/issues/140) diff --git a/buildToken.hxml b/buildToken.hxml index 9255fed..3626346 100644 --- a/buildToken.hxml +++ b/buildToken.hxml @@ -2,8 +2,6 @@ -cp test -lib hxparse -lib haxeparser --lib compiletime --lib hxargs --each -D keep_whitespace @@ -12,3 +10,4 @@ -D checkstyle -D debugTokenTree -x TokenTestMain +# --macro nullSafety('tokentree') diff --git a/gruntfile.js b/gruntfile.js index b7ae008..c06e494 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -4,9 +4,7 @@ module.exports = function(grunt) { shell: { libs: { command: "haxelib install haxeparser 3.3.0 && " + - "haxelib install hxargs 3.0.2 && " + - "haxelib install compiletime 2.6.0 && " + - "haxelib install mcover 2.1.1 && " + + "haxelib install mcover && " + "haxelib install munit" } }, @@ -31,7 +29,7 @@ module.exports = function(grunt) { function haxeOptions() { return { build: { - hxml: "build.hxml" + hxml: "test.hxml" } }; } \ No newline at end of file diff --git a/haxelib.json b/haxelib.json index 4f982d3..8230275 100644 --- a/haxelib.json +++ b/haxelib.json @@ -8,7 +8,7 @@ "AlexHaxe" ], "releasenote": "bugfixes - see CHANGELOG for details", - "version": "1.0.15", + "version": "1.0.16", "url": "https://github.com/HaxeCheckstyle/tokentree", "dependencies": {} } \ No newline at end of file diff --git a/package.json b/package.json index 0ce9e09..4cd83e1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tokentree", - "version": "1.0.15", - "description": "TokenTree library used by haxe-checkstyle", + "version": "1.0.16", + "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver", "repository": { "type": "git", "url": "https://github.com/HaxeCheckstyle/tokentree" diff --git a/test.hxml b/test.hxml index e6bf832..24c22d9 100644 --- a/test.hxml +++ b/test.hxml @@ -2,8 +2,6 @@ -cp test -cp resources -lib haxeparser --lib compiletime --lib hxargs -lib mcover -lib munit -D unittest