Skip to content

Commit c6130aa

Browse files
committed
updated tokentree lib
removed Java target
1 parent eb093ec commit c6130aa

File tree

7 files changed

+9
-19
lines changed

7 files changed

+9
-19
lines changed

.github/workflows/checkstyle-linux.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
haxe-version: ['4.3.2', 'nightly']
18+
haxe-version: ['4.3.3', 'nightly']
1919
env:
2020
CC_TEST_REPORTER_ID: c4eda639526d39fbcab7ab9fc68c4046d4e597df56dbcb552b42d27b3580b758
2121
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -66,10 +66,8 @@ jobs:
6666
run: npx haxe buildSchema.hxml
6767
- name: Run eval tests
6868
run: npx haxe -D codecov_json testAndResources.hxml
69-
- name: Run Java tests
70-
run: npx haxe testJava.hxml
7169
- name: Run JVM tests
72-
run: npx haxe testJvm.hxml
70+
run: npx haxe testJava.hxml
7371
- name: Format and upload codeclimate coverage
7472
if: success() && matrix.haxe-version == 'nightly'
7573
run: |

.haxerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "4.3.2",
2+
"version": "4.3.3",
33
"resolveLibs": "scoped"
44
}

build/Build.hx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class Build {
1616
callLix("buildSchema.hxml", "Json schema");
1717
callLix("testAndResources.hxml", "Unittests neko / eval + generate resoucres");
1818
callLix("testJava.hxml", "Unittests Java");
19-
callLix("testJvm.hxml", "Unittests Jvm");
2019
Sys.exit(exitCode);
2120
}
2221

haxe_libraries/tokentree.hxml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# @install: lix --silent download "haxelib:/tokentree#1.2.10" into tokentree/1.2.10/haxelib
2-
-cp ${HAXE_LIBCACHE}/tokentree/1.2.10/haxelib/src
3-
-D tokentree=1.2.10
1+
# @install: lix --silent download "haxelib:/tokentree#1.2.11" into tokentree/1.2.11/haxelib
2+
-cp ${HAXE_LIBCACHE}/tokentree/1.2.11/haxelib/src
3+
-D tokentree=1.2.11

src/checkstyle/checks/modifier/ModifierOrderCheck.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ enum abstract ModifierOrderCheckModifier(String) {
8989
var FINAL = "FINAL";
9090
var ABSTRACT = "ABSTRACT";
9191
var OVERLOAD = "OVERLOAD";
92-
#if (haxe > version("4.3.0"))
93-
var ENUM = "OVERLOAD";
92+
#if (haxe >= version("5.0.0-alpha"))
93+
var ENUM = "ENUM";
9494
#end
9595

9696
@:from

testJava.hxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
build/commonTest.hxml
22

3-
-java out
3+
--jvm out/TestMain.jar
44
-main TestMain
55

66
-cmd java -jar out/TestMain.jar

testJvm.hxml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)