updated libs

cleanup
vshaxe · Jan 10, 2025 · 3eda297 · 3eda297
1 parent 26c193b
commit 3eda297
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,11 +10,11 @@ jobs:
   build:
     strategy:
       matrix:
-        haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.3, nightly]
+        haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.6, nightly]
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - run: npm install
     - name: install dependencies for all samples
       run: |

diff --git a/haxe_libraries/hxnodejs.hxml b/haxe_libraries/hxnodejs.hxml
@@ -1,7 +1,7 @@
-# @install: lix --silent download "haxelib:/hxnodejs#12.1.0" into hxnodejs/12.1.0/haxelib
--cp ${HAXE_LIBCACHE}/hxnodejs/12.1.0/haxelib/src
--D hxnodejs=12.1.0
---macro allowPackage('sys')
-# should behave like other target defines and not be defined in macro context
---macro define('nodejs')
---macro _internal.SuppressDeprecated.run()
+# @install: lix --silent download "haxelib:/hxnodejs#12.2.0" into hxnodejs/12.2.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxnodejs/12.2.0/haxelib/src
+-D hxnodejs=12.2.0
+--macro allowPackage('sys')
+# should behave like other target defines and not be defined in macro context
+--macro define('nodejs')
+--macro _internal.SuppressDeprecated.run()
diff --git a/haxe_libraries/json2object.hxml b/haxe_libraries/json2object.hxml
@@ -1,4 +1,4 @@
-# @install: lix --silent download "haxelib:/json2object#3.11.0" into json2object/3.11.0/haxelib
+# @install: lix --silent download "gh://github.com/elnabo/json2object#a75859de1e966c09e73591b6c9186086c143fe60" into json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60
 -lib hxjsonast
--cp ${HAXE_LIBCACHE}/json2object/3.11.0/haxelib/src
+-cp ${HAXE_LIBCACHE}/json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60/src
 -D json2object=3.11.0
diff --git a/samples/buddy/haxe_libraries/test-adapter.hxml b/samples/buddy/haxe_libraries/test-adapter.hxml
@@ -1,5 +1,5 @@
 -lib json2object
 -cp ../../test-adapter
--D test-adapter=2.0.5
+-D test-adapter=2.0.7
 ${SCOPE_DIR}/../../test-adapter/extraParams.hxml
 --macro Sys.println("haxe_libraries/test-adapter.hxml:3: [Warning] Using dev version of library test-adapter")
diff --git a/samples/haxeunit/haxe_libraries/test-adapter.hxml b/samples/haxeunit/haxe_libraries/test-adapter.hxml
@@ -1,5 +1,5 @@
 -lib json2object
 -cp ../../test-adapter
--D test-adapter=2.0.5
+-D test-adapter=2.0.7
 ${SCOPE_DIR}/../../test-adapter/extraParams.hxml
 --macro Sys.println("haxe_libraries/test-adapter.hxml:3: [Warning] Using dev version of library test-adapter")
diff --git a/samples/hexunit/haxe_libraries/test-adapter.hxml b/samples/hexunit/haxe_libraries/test-adapter.hxml
@@ -1,5 +1,5 @@
 -lib json2object
 -cp ../../test-adapter
--D test-adapter=2.0.5
+-D test-adapter=2.0.7
 ${SCOPE_DIR}/../../test-adapter/extraParams.hxml
 --macro Sys.println("haxe_libraries/test-adapter.hxml:3: [Warning] Using dev version of library test-adapter")
diff --git a/samples/munit/haxe_libraries/test-adapter.hxml b/samples/munit/haxe_libraries/test-adapter.hxml
@@ -1,5 +1,5 @@
 -lib json2object
 -cp ../../test-adapter
--D test-adapter=2.0.5
+-D test-adapter=2.0.7
 ${SCOPE_DIR}/../../test-adapter/extraParams.hxml
 --macro Sys.println("haxe_libraries/test-adapter.hxml:3: [Warning] Using dev version of library test-adapter")
diff --git a/samples/tink_unittest/haxe_libraries/test-adapter.hxml b/samples/tink_unittest/haxe_libraries/test-adapter.hxml
@@ -1,5 +1,5 @@
 -lib json2object
 -cp ../../test-adapter
--D test-adapter=2.0.5
+-D test-adapter=2.0.7
 ${SCOPE_DIR}/../../test-adapter/extraParams.hxml
 --macro Sys.println("haxe_libraries/test-adapter.hxml:3: [Warning] Using dev version of library test-adapter")
diff --git a/samples/utest/haxe_libraries/test-adapter.hxml b/samples/utest/haxe_libraries/test-adapter.hxml
@@ -1,5 +1,5 @@
 -lib json2object
 -cp ../../test-adapter
--D test-adapter=2.0.5
+-D test-adapter=2.0.7
 ${SCOPE_DIR}/../../test-adapter/extraParams.hxml
 --macro Sys.println("haxe_libraries/test-adapter.hxml:3: [Warning] Using dev version of library test-adapter")
diff --git a/samples/utest/src/Main.hx b/samples/utest/src/Main.hx
@@ -35,11 +35,8 @@ class TestCase extends utest.Test {
 		Sys.sleep(Math.random());
 	}
 
-	#if (utest >= version("2.0.0-alpha"))
-	@:ignore("Description")
-	#else
-	@Ignored("Description")
-	#end
+	@Ignored("Description") // utest 1.x
+	@:ignore("Description") // utest 2.x
 	function testIgnore() {}
 }
 

diff --git a/test-adapter/_testadapter/data/TestFilter.hx b/test-adapter/_testadapter/data/TestFilter.hx
@@ -47,15 +47,15 @@ class TestFilter {
 
 	public function get():TestFilterList {
 		if (!loaded) {
-			load();
+			load(baseFolder);
 		}
 		return testFilters;
 	}
 
 	public function clear() {
 		testFilters.include = [];
 		testFilters.exclude = [];
-		save();
+		save(baseFolder);
 	}
 
 	function save(?baseFolder:String) {
@@ -69,11 +69,11 @@ class TestFilter {
 		#end
 	}
 
-	function load() {
+	function load(?baseFolder:String) {
 		testFilters.include = [];
 		testFilters.exclude = [];
 		#if (sys || nodejs)
-		var fileName:String = getFileName();
+		var fileName:String = getFileName(baseFolder);
 		if (!FileSystem.exists(fileName)) {
 			return;
 		}

diff --git a/test-adapter/_testadapter/utest/Reporter.hx b/test-adapter/_testadapter/utest/Reporter.hx
@@ -94,8 +94,12 @@ class Reporter implements IReport<Reporter> {
 	public function setHandler(handler:Reporter->Void) {}
 }
 
+#if haxe4
 #if (utest >= version("2.0.0-alpha"))
 typedef Stack = CallStack;
 #else
 typedef Stack = Array<StackItem>;
 #end
+#else
+typedef Stack = Array<StackItem>;
+#end