From 4d322b46d0fa80b1157055029e89ec4ed37f72c4 Mon Sep 17 00:00:00 2001 From: George FunBook Date: Mon, 8 May 2023 11:50:46 -0500 Subject: [PATCH 1/2] remove haxe 4.3.1 deprecation warnings --- src/massive/munit/TestResult.hx | 3 +-- src/massive/munit/client/HTTPClient.hx | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/massive/munit/TestResult.hx b/src/massive/munit/TestResult.hx index a6f764e..7778b39 100644 --- a/src/massive/munit/TestResult.hx +++ b/src/massive/munit/TestResult.hx @@ -110,8 +110,7 @@ class TestResult } -@:enum -abstract TestResultType(String) to String +enum abstract TestResultType(String) to String { var UNKNOWN = "UNKNOWN"; var PASS = "PASS"; diff --git a/src/massive/munit/client/HTTPClient.hx b/src/massive/munit/client/HTTPClient.hx index 93cc194..a2f61b5 100644 --- a/src/massive/munit/client/HTTPClient.hx +++ b/src/massive/munit/client/HTTPClient.hx @@ -47,21 +47,21 @@ import Std.is as isOfType; */ class HTTPClient implements IAdvancedTestResultClient { - @:extern public inline static var DEFAULT_SERVER_URL:String = "http://localhost:2000"; + extern public inline static var DEFAULT_SERVER_URL:String = "http://localhost:2000"; /** * Default id of this client. */ - @:extern public inline static var DEFAULT_ID:String = "HTTPClient"; + extern public inline static var DEFAULT_ID:String = "HTTPClient"; /** * HTTP header key. Contains id of client the HTTPClient is decorating. */ - @:extern public inline static var CLIENT_HEADER_KEY:String = "munit-clientId"; + extern public inline static var CLIENT_HEADER_KEY:String = "munit-clientId"; /** * HTTP header key. Contains id of platform being tests (flash,js,neko,cpp,php). */ - @:extern public inline static var PLATFORM_HEADER_KEY:String = "munit-platformId"; + extern public inline static var PLATFORM_HEADER_KEY:String = "munit-platformId"; /* Global sequental (FIFO) http request queue */ private static var queue:Array = []; From be5c8688b135dfb4749f9525b0954ba92c9f12ef Mon Sep 17 00:00:00 2001 From: George FunBook Date: Mon, 8 May 2023 11:54:23 -0500 Subject: [PATCH 2/2] bckwards compatibility --- src/massive/munit/TestResult.hx | 3 ++- src/massive/munit/client/HTTPClient.hx | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/massive/munit/TestResult.hx b/src/massive/munit/TestResult.hx index 7778b39..668db83 100644 --- a/src/massive/munit/TestResult.hx +++ b/src/massive/munit/TestResult.hx @@ -110,7 +110,8 @@ class TestResult } -enum abstract TestResultType(String) to String +#if haxe4 enum #else @:enum #end +abstract TestResultType(String) to String { var UNKNOWN = "UNKNOWN"; var PASS = "PASS"; diff --git a/src/massive/munit/client/HTTPClient.hx b/src/massive/munit/client/HTTPClient.hx index a2f61b5..61ae7d4 100644 --- a/src/massive/munit/client/HTTPClient.hx +++ b/src/massive/munit/client/HTTPClient.hx @@ -47,21 +47,25 @@ import Std.is as isOfType; */ class HTTPClient implements IAdvancedTestResultClient { - extern public inline static var DEFAULT_SERVER_URL:String = "http://localhost:2000"; + #if haxe4 extern #else @:extern #end + public inline static var DEFAULT_SERVER_URL:String = "http://localhost:2000"; /** * Default id of this client. */ - extern public inline static var DEFAULT_ID:String = "HTTPClient"; + #if haxe4 extern #else @:extern #end + public inline static var DEFAULT_ID:String = "HTTPClient"; /** * HTTP header key. Contains id of client the HTTPClient is decorating. */ - extern public inline static var CLIENT_HEADER_KEY:String = "munit-clientId"; + #if haxe4 extern #else @:extern #end + public inline static var CLIENT_HEADER_KEY:String = "munit-clientId"; /** * HTTP header key. Contains id of platform being tests (flash,js,neko,cpp,php). */ - extern public inline static var PLATFORM_HEADER_KEY:String = "munit-platformId"; + #if haxe4 extern #else @:extern #end + public inline static var PLATFORM_HEADER_KEY:String = "munit-platformId"; /* Global sequental (FIFO) http request queue */ private static var queue:Array = [];