HaxeCheckstyle · AlexHaxe · Oct 15, 2019 · Oct 15, 2019 · Oct 15, 2019 · Oct 15, 2019
diff --git a/.haxerc b/.haxerc
@@ -0,0 +1,4 @@
+{
+  "version": "4.0.0-rc.5",
+  "resolveLibs": "scoped"
+}
diff --git a/.travis.yml b/.travis.yml
@@ -1,53 +1,44 @@
-git:
-  depth: 1
-
-language: haxe
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
+language: node_js
+node_js:
+  - "10"
 sudo: false
 dist: xenial
 
+env:
+  global:
+    - CC_TEST_REPORTER_ID=1dff6f89d7179dff5db635c6b4fe64acdd5694c9ed44d7da5f12f0f7d3d163b7
+  matrix:
+    - HAXE_VERSION=haxe347
+    - HAXE_VERSION=haxe4rc5
+    - 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" == "haxe4rc5" ]]; then npx lix download haxe 4.0.0-rc.5; npx lix use haxe 4.0.0-rc.5; fi
+  - if [[ "$HAXE_VERSION" == "nightly" ]]; then npx lix download haxe nightly; npx lix use haxe nightly; fi
+  - npx lix download
+  - npx haxe -version
+  - npx neko -version
+  - npx haxelib list
+
+before_script:
+  - ./cc-test-reporter before-build
+
 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
+  - npx haxe build.hxml
+  - npx haxe buildDebug.hxml
+  - npx haxe buildJS.hxml
+  - npx haxe buildCpp.hxml
+  - npx haxe buildSchema.hxml
+  - npx haxe -D codecov_json buildTest.hxml
+  - npx haxe testJava.hxml
+
+after_script:
+  - (cd src; ../cc-test-reporter format-coverage -t lcov ../lcov.info)
+  - (cd src; ../cc-test-reporter upload-coverage)
 
-matrix:
-  include:
-    - haxe: 3.4.7
-      install:
-        - haxelib git tokentree https://github.com/HaxeCheckstyle/tokentree master src
-        - haxelib git hxnodejs https://github.com/HaxeFoundation/hxnodejs.git master
-        - haxelib git json2object https://github.com/elnabo/json2object
-        - 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
-        - haxelib install mconsole
-        - haxelib install mlib
-        - haxelib install test-adapter
-    - haxe: development
-      install:
-        - haxelib git tokentree https://github.com/HaxeCheckstyle/tokentree master src
-        - haxelib git hxparse https://github.com/simn/hxparse
-        - haxelib git haxeparser https://github.com/simn/haxeparser
-        - haxelib git mcover https://github.com/massiveinteractive/mcover master src
-        - haxelib git munit https://github.com/massiveinteractive/MassiveUnit master src
-        - 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
-        - haxelib install hxargs 3.0.2
-        - haxelib install test-adapter
-        - sed -i 's/:3.3.0//' buildGlobal.hxml
+after_success:
+  - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## dev branch / next version (2.x.x)
 
+- Refactored build system to use lix ([#478](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/478))
+
 ## 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)

diff --git a/build/Build.hx b/build/Build.hx
@@ -0,0 +1,29 @@
+import haxe.Timer;
+
+/**
+	helper class to build everything, avoids `--next`
+**/
+class Build {
+	/**
+		run all build files
+	**/
+	public static function main() {
+		callLix("build.hxml", "run.n");
+		callLix("buildDebug.hxml", "runD.n");
+		callLix("buildJS.hxml", "run.js");
+		callLix("buildSchema.hxml", "Json schema");
+		callLix("buildTest.hxml", "Unittests");
+	}
+
+	/**
+		perform lix call and take build times
+
+		@param buildFile HXML build file
+		@param title description to use when printing build time
+	**/
+	public static function callLix(buildFile:String, title:String) {
+		var startTime = Timer.stamp();
+		Sys.command("npx", ["haxe", buildFile]);
+		Sys.println('building $title (${Timer.stamp() - startTime})');
+	}
+}
diff --git a/buildAll.hxml b/buildAll.hxml
@@ -1,17 +1,2 @@
-build.hxml
-
---next
-
-buildDebug.hxml
-
---next
-
-buildJS.hxml
-
---next
-
-buildSchema.hxml
-
---next
-
-buildTest.hxml
+-cp build
+--run Build
diff --git a/buildGlobal.hxml b/buildGlobal.hxml
@@ -1,5 +1,5 @@
 -cp src
 -lib haxeparser
--lib compiletime:2.6.0
--lib hxargs:3.0.2
+-lib compiletime
+-lib hxargs
 -lib tokentree
diff --git a/buildSchema.hxml b/buildSchema.hxml
@@ -1,4 +1,3 @@
 buildGlobal.hxml
 -cp schema
--xml resources/schema.xml
 -x SchemaGenerator
diff --git a/buildTelemetry.hxml b/buildTelemetry.hxml
@@ -1,8 +1,6 @@
 buildGlobal.hxml
 -lib hxtelemetry
 
---each
-
 -D HXCPP_STACK_TRACE
 -D HXCPP_TELEMETRY
 

diff --git a/buildTest.hxml b/buildTest.hxml
@@ -7,7 +7,6 @@ buildGlobal.hxml
 -x TestMain
 --macro mcover.MCover.coverage(['checkstyle'], ['src'], ['checkstyle.reporter', 'checkstyle.Main'])
 
---next
--cmd neko run -s src -s test -s schema -p resources/static-analysis.txt
+-cmd neko run -s src -s test -s schema -s build -p resources/static-analysis.txt
 -cmd neko run --default-config resources/default-config.json
 -cmd neko run -c resources/default-config.json
diff --git a/checkstyle.json b/checkstyle.json
@@ -11,7 +11,10 @@
         },
         {
             "type": "AvoidStarImport"
-        },
+		},
+		{
+			"type": "BlockBreakingConditional"
+		},
         {
             "props": {
                 "format": "^(e)$"
@@ -153,7 +156,7 @@
                 "character": "tab"
             },
             "type": "IndentationCharacter"
-        },
+		},
         {
             "type": "InnerAssignment"
         },

diff --git a/gruntfile.js b/gruntfile.js
diff --git a/haxe3_libraries/compiletime.hxml b/haxe3_libraries/compiletime.hxml
@@ -0,0 +1,3 @@
+-D compiletime=2.8.0
+# @install: lix --silent download "haxelib:/compiletime#2.8.0" into compiletime/2.8.0/haxelib
+-cp ${HAXE_LIBCACHE}/compiletime/2.8.0/haxelib/src/
diff --git a/haxe3_libraries/haxeparser.hxml b/haxe3_libraries/haxeparser.hxml
@@ -0,0 +1,4 @@
+-D haxeparser=3.3.0
+# @install: lix --silent download "haxelib:/haxeparser#3.3.0" into haxeparser/3.3.0/haxelib
+-lib hxparse
+-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/haxelib/src
diff --git a/haxe3_libraries/hxargs.hxml b/haxe3_libraries/hxargs.hxml
@@ -0,0 +1,3 @@
+-D hxargs=3.0.2
+# @install: lix --silent download "gh://github.com/Simn/hxargs#27eb1114ebcc82fe02abf2cfa3738ae6f43b0e24" into hxargs/3.0.2/github/27eb1114ebcc82fe02abf2cfa3738ae6f43b0e24
+-cp ${HAXE_LIBCACHE}/hxargs/3.0.2/github/27eb1114ebcc82fe02abf2cfa3738ae6f43b0e24/
diff --git a/haxe3_libraries/hxcpp.hxml b/haxe3_libraries/hxcpp.hxml
@@ -0,0 +1,4 @@
+-D hxcpp=4.0.52
+# @install: lix --silent download "haxelib:/hxcpp#4.0.52" into hxcpp/4.0.52/haxelib
+# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.0.52/haxelib
+-cp ${HAXE_LIBCACHE}/hxcpp/4.0.52/haxelib/
diff --git a/haxe3_libraries/hxjava.hxml b/haxe3_libraries/hxjava.hxml
@@ -0,0 +1,5 @@
+-D hxjava=3.2.0
+# @install: lix --silent download "haxelib:/hxjava#3.2.0" into hxjava/3.2.0/haxelib
+# @run: haxelib run-dir hxjava ${HAXE_LIBCACHE}/hxjava/3.2.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxjava/3.2.0/haxelib/
+-java-lib lib/hxjava-std.jar
diff --git a/haxe3_libraries/hxjsonast.hxml b/haxe3_libraries/hxjsonast.hxml
@@ -0,0 +1,3 @@
+-D hxjsonast=1.0.1
+# @install: lix --silent download "haxelib:/hxjsonast#1.0.1" into hxjsonast/1.0.1/haxelib
+-cp ${HAXE_LIBCACHE}/hxjsonast/1.0.1/haxelib/src
diff --git a/haxe3_libraries/hxnodejs.hxml b/haxe3_libraries/hxnodejs.hxml
@@ -0,0 +1,6 @@
+-D hxnodejs=10.0.0
+# @install: lix --silent download "gh://github.com/HaxeFoundation/hxnodejs#462c800e16aa0b91df5a7c5d54782b313c3f8730" into hxnodejs/10.0.0/github/462c800e16aa0b91df5a7c5d54782b313c3f8730
+-cp ${HAXE_LIBCACHE}/hxnodejs/10.0.0/github/462c800e16aa0b91df5a7c5d54782b313c3f8730/src
+--macro allowPackage('sys')
+# should behave like other target defines and not be defined in macro context
+--macro define('nodejs')
diff --git a/haxe3_libraries/hxparse.hxml b/haxe3_libraries/hxparse.hxml
@@ -0,0 +1,3 @@
+-D hxparse=4.0.0
+# @install: lix --silent download "haxelib:/hxparse#4.0.0" into hxparse/4.0.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxparse/4.0.0/haxelib/src
diff --git a/haxe3_libraries/json2object.hxml b/haxe3_libraries/json2object.hxml
@@ -0,0 +1,4 @@
+-D json2object=3.6.4
+# @install: lix --silent download "gh://github.com/elnabo/json2object#bd00ad1713bf6bda06d8a7c9ddc90888e8a6094c" into json2object/3.6.4/github/bd00ad1713bf6bda06d8a7c9ddc90888e8a6094c
+-lib hxjsonast
+-cp ${HAXE_LIBCACHE}/json2object/3.6.4/github/bd00ad1713bf6bda06d8a7c9ddc90888e8a6094c/src
diff --git a/haxe3_libraries/mconsole.hxml b/haxe3_libraries/mconsole.hxml
@@ -0,0 +1,3 @@
+-D mconsole=1.6.0
+# @install: lix --silent download "haxelib:/mconsole#1.6.0" into mconsole/1.6.0/haxelib
+-cp ${HAXE_LIBCACHE}/mconsole/1.6.0/haxelib/
diff --git a/haxe3_libraries/mcover.hxml b/haxe3_libraries/mcover.hxml
@@ -0,0 +1,5 @@
+-D mcover=2.2.1
+# @install: lix --silent download "haxelib:/mcover#2.2.1" into mcover/2.2.1/haxelib
+-lib mconsole
+-lib munit
+-cp ${HAXE_LIBCACHE}/mcover/2.2.1/haxelib/
diff --git a/haxe3_libraries/mlib.hxml b/haxe3_libraries/mlib.hxml
@@ -0,0 +1,4 @@
+-D mlib=2.0.3
+# @install: lix --silent download "haxelib:/mlib#2.0.3" into mlib/2.0.3/haxelib
+# @run: haxelib run-dir mlib ${HAXE_LIBCACHE}/mlib/2.0.3/haxelib
+-cp ${HAXE_LIBCACHE}/mlib/2.0.3/haxelib/
diff --git a/haxe3_libraries/munit.hxml b/haxe3_libraries/munit.hxml
@@ -0,0 +1,6 @@
+-D munit=2.3.4
+# @install: lix --silent download "haxelib:/munit#2.3.4" into munit/2.3.4/haxelib
+# @run: haxelib run-dir munit ${HAXE_LIBCACHE}/munit/2.3.4/haxelib
+-lib mcover
+-lib mlib
+-cp ${HAXE_LIBCACHE}/munit/2.3.4/haxelib/
diff --git a/haxe3_libraries/test-adapter.hxml b/haxe3_libraries/test-adapter.hxml
@@ -0,0 +1,5 @@
+-D test-adapter=1.2.5
+# @install: lix --silent download "haxelib:/test-adapter#1.2.5" into test-adapter/1.2.5/haxelib
+-lib json2object
+-cp ${HAXE_LIBCACHE}/test-adapter/1.2.5/haxelib/
+--macro _testadapter.Macro.init()
diff --git a/haxe3_libraries/tokentree.hxml b/haxe3_libraries/tokentree.hxml
@@ -0,0 +1,3 @@
+-D tokentree=1.0.23
+# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#3b66fcf61e55178e75c01168a58c0cdece198e48" into tokentree/1.0.23/github/3b66fcf61e55178e75c01168a58c0cdece198e48
+-cp ${HAXE_LIBCACHE}/tokentree/1.0.23/github/3b66fcf61e55178e75c01168a58c0cdece198e48/src
diff --git a/haxe_libraries/compiletime.hxml b/haxe_libraries/compiletime.hxml
@@ -0,0 +1,3 @@
+-D compiletime=2.8.0
+# @install: lix --silent download "haxelib:/compiletime#2.8.0" into compiletime/2.8.0/haxelib
+-cp ${HAXE_LIBCACHE}/compiletime/2.8.0/haxelib/src/
diff --git a/haxe_libraries/haxeparser.hxml b/haxe_libraries/haxeparser.hxml
@@ -0,0 +1,4 @@
+-D haxeparser=3.3.0
+# @install: lix --silent download "gh://github.com/Simn/haxeparser#e5746bfc55c09a3694db42738ff575b91441971a" into haxeparser/3.3.0/github/e5746bfc55c09a3694db42738ff575b91441971a
+-lib hxparse
+-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/e5746bfc55c09a3694db42738ff575b91441971a/src
diff --git a/haxe_libraries/hxargs.hxml b/haxe_libraries/hxargs.hxml
@@ -0,0 +1,3 @@
+-D hxargs=3.0.2
+# @install: lix --silent download "gh://github.com/Simn/hxargs#27eb1114ebcc82fe02abf2cfa3738ae6f43b0e24" into hxargs/3.0.2/github/27eb1114ebcc82fe02abf2cfa3738ae6f43b0e24
+-cp ${HAXE_LIBCACHE}/hxargs/3.0.2/github/27eb1114ebcc82fe02abf2cfa3738ae6f43b0e24/
diff --git a/haxe_libraries/hxcpp.hxml b/haxe_libraries/hxcpp.hxml
@@ -0,0 +1,4 @@
+-D hxcpp=4.0.52
+# @install: lix --silent download "haxelib:/hxcpp#4.0.52" into hxcpp/4.0.52/haxelib
+# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.0.52/haxelib
+-cp ${HAXE_LIBCACHE}/hxcpp/4.0.52/haxelib/
diff --git a/haxe_libraries/hxjava.hxml b/haxe_libraries/hxjava.hxml
@@ -0,0 +1,5 @@
+-D hxjava=4.0.0-alpha
+# @install: lix --silent download "haxelib:/hxjava#4.0.0-alpha" into hxjava/4.0.0-alpha/haxelib
+# @run: haxelib run-dir hxjava ${HAXE_LIBCACHE}/hxjava/4.0.0-alpha/haxelib
+-cp ${HAXE_LIBCACHE}/hxjava/4.0.0-alpha/haxelib/
+-java-lib lib/hxjava-std.jar
diff --git a/haxe_libraries/hxjsonast.hxml b/haxe_libraries/hxjsonast.hxml
@@ -0,0 +1,3 @@
+-D hxjsonast=1.0.1
+# @install: lix --silent download "haxelib:/hxjsonast#1.0.1" into hxjsonast/1.0.1/haxelib
+-cp ${HAXE_LIBCACHE}/hxjsonast/1.0.1/haxelib/src
diff --git a/haxe_libraries/hxnodejs.hxml b/haxe_libraries/hxnodejs.hxml
@@ -0,0 +1,6 @@
+-D hxnodejs=10.0.0
+# @install: lix --silent download "gh://github.com/HaxeFoundation/hxnodejs#462c800e16aa0b91df5a7c5d54782b313c3f8730" into hxnodejs/10.0.0/github/462c800e16aa0b91df5a7c5d54782b313c3f8730
+-cp ${HAXE_LIBCACHE}/hxnodejs/10.0.0/github/462c800e16aa0b91df5a7c5d54782b313c3f8730/src
+--macro allowPackage('sys')
+# should behave like other target defines and not be defined in macro context
+--macro define('nodejs')
diff --git a/haxe_libraries/hxparse.hxml b/haxe_libraries/hxparse.hxml
@@ -0,0 +1,3 @@
+-D hxparse=4.0.0
+# @install: lix --silent download "gh://github.com/Simn/hxparse#f61faa2021f2abb85360f997ff72c4156c891adc" into hxparse/4.0.0/github/f61faa2021f2abb85360f997ff72c4156c891adc
+-cp ${HAXE_LIBCACHE}/hxparse/4.0.0/github/f61faa2021f2abb85360f997ff72c4156c891adc/src
diff --git a/haxe_libraries/json2object.hxml b/haxe_libraries/json2object.hxml
@@ -0,0 +1,4 @@
+-D json2object=3.6.4
+# @install: lix --silent download "haxelib:/json2object#3.6.4" into json2object/3.6.4/haxelib
+-lib hxjsonast
+-cp ${HAXE_LIBCACHE}/json2object/3.6.4/haxelib/src
diff --git a/haxe_libraries/mconsole.hxml b/haxe_libraries/mconsole.hxml
@@ -0,0 +1,3 @@
+-D mconsole=1.6.0
+# @install: lix --silent download "haxelib:/mconsole#1.6.0" into mconsole/1.6.0/haxelib
+-cp ${HAXE_LIBCACHE}/mconsole/1.6.0/haxelib/