Merge pull request #69 from DoclerLabs/develop

DoclerLabs/hexMachina#222 Drop haxe 3.2.1 support
FrancisBourre · Mar 21, 2017 · 72a3898 · 72a3898
2 parents e25b3b0 + f68449b
commit 72a3898
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 95 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ language: haxe
 
 # haxe versions : http://haxe.org/website-content/downloads/versions.json
 haxe:
-  - "3.2.1"
   - "3.4.0"
   - development
 
@@ -58,10 +57,10 @@ install:
   - haxe flash/install.hxml
 
 script:
-  - if [ $TRAVIS_HAXE_VERSION != "3.2.1" ]; then haxe build-php.hxml && php bin/index.php; fi
-  - if [ $TRAVIS_HAXE_VERSION != "3.2.1" ]; then haxe build-neko.hxml && neko bin/MainTest.n; fi
-  - if [ $TRAVIS_HAXE_VERSION != "3.2.1" ]; then haxe build-js.hxml && node bin/MainTest.js; fi
-  - if [ $TRAVIS_HAXE_VERSION != "3.2.1" ]; then haxe build-flash.hxml -D fdb && haxe flash/run.hxml bin/MainTest.swf; fi
+  - haxe build-php.hxml && php bin/index.php
+  - haxe build-neko.hxml && neko bin/MainTest.n
+  - haxe build-js.hxml && node bin/MainTest.js
+  - haxe build-flash.hxml -D fdb && haxe flash/run.hxml bin/MainTest.swf
 
 notifications:
   email:

diff --git a/src/hex/model/BasicModel.hx b/src/hex/model/BasicModel.hx
@@ -1,21 +1,14 @@
 package hex.model;
 
 import hex.model.IModelDispatcher;
-
-#if ( haxe_ver >= "3.3" )
 import haxe.Constraints.Constructible;
-#end
 
 /**
  * ...
  * @author duke
  */
 @:generic
-#if ( haxe_ver >= "3.3" )
 class BasicModel<DispatcherType:(IModelDispatcher<ListenerType>, haxe.Constraints.Constructible<Void->Void>), ListenerType: {}>
-#else
-class BasicModel<DispatcherType:IModelDispatcher<ListenerType>, ListenerType: {}>
-#end
 {
 	public var dispatcher : DispatcherType;
 

diff --git a/test/hex/control/async/AsyncCommandTest.hx b/test/hex/control/async/AsyncCommandTest.hx
@@ -1,6 +1,5 @@
 package hex.control.async;
 
-#if (!neko || haxe_ver >= "3.3")
 import hex.control.async.AsyncCommand;
 import hex.control.async.IAsyncCommandListener;
 import hex.di.IDependencyInjector;
@@ -237,5 +236,4 @@ private class MockModule implements IModule
 	{
 		return null;
 	}
-}
-#end
+}
diff --git a/test/hex/control/async/AsyncCommandUtilTest.hx b/test/hex/control/async/AsyncCommandUtilTest.hx
@@ -1,7 +1,5 @@
 package hex.control.async;
 
-#if (!neko || haxe_ver >= "3.3")
-import haxe.Constraints.Function;
 import hex.control.async.AsyncCommandUtil;
 import hex.control.async.IAsyncCommand;
 import hex.control.async.IAsyncCommandListener;
@@ -203,5 +201,4 @@ private class ASyncCommandListener implements IAsyncCommandListener
 	{
 
 	}
-}
-#end
+}
diff --git a/test/hex/control/async/MVCAsyncSuite.hx b/test/hex/control/async/MVCAsyncSuite.hx
@@ -7,11 +7,10 @@ package hex.control.async;
 class MVCAsyncSuite
 {
 	@Suite("Async")
-    public var list : Array<Class<Dynamic>> = [ AsyncCommandMessageTest, 
-	#if (!neko || haxe_ver >= "3.3")
-	AsyncCommandTest, 
-	AsyncCommandUtilTest
-	#end
+    public var list : Array<Class<Dynamic>> = [
+		AsyncCommandMessageTest,
+		AsyncCommandTest,
+		AsyncCommandUtilTest
 	];
 
 }
diff --git a/test/hex/control/command/CommandExecutorTest.hx b/test/hex/control/command/CommandExecutorTest.hx
@@ -1,6 +1,5 @@
 package hex.control.command;
 
-#if (!neko || haxe_ver >= "3.3")
 import hex.MockDependencyInjector;
 import hex.control.Request;
 import hex.control.async.AsyncCommand;
@@ -225,5 +224,4 @@ private class MockImplementation implements IMockType
 private interface IMockType
 {
 
-}
-#end
+}
diff --git a/test/hex/control/command/MVCCommandSuite.hx b/test/hex/control/command/MVCCommandSuite.hx
@@ -6,10 +6,10 @@ package hex.control.command;
  */
 class MVCCommandSuite
 {
-		@Suite("Command")
-    public var list : Array<Class<Dynamic>> = [BasicCommandTest, 
-	#if (!neko || haxe_ver >= "3.3")
-	CommandExecutorTest, 
-	#end
-	CommandMappingTest ];
+	@Suite("Command")
+    public var list : Array<Class<Dynamic>> = [
+			BasicCommandTest,
+			CommandExecutorTest,
+			CommandMappingTest
+		];
 }
diff --git a/test/hex/control/command/MockAsyncCommandForTestingExecution.hx b/test/hex/control/command/MockAsyncCommandForTestingExecution.hx
@@ -1,6 +1,5 @@
 package hex.control.command;
 
-#if (!neko || haxe_ver >= "3.3")
 import hex.control.Request;
 import hex.control.async.AsyncCommand;
 import hex.module.IModule;
@@ -49,5 +48,4 @@ class MockAsyncCommandForTestingExecution extends AsyncCommand
 	{
 		MockAsyncCommandForTestingExecution.cancelHandlers.push( callback );
 	}
-}
-#end
+}
diff --git a/test/hex/control/macro/MVCMacroSuite.hx b/test/hex/control/macro/MVCMacroSuite.hx
@@ -8,9 +8,7 @@ class MVCMacroSuite
 {
 	@Suite("Macro")
     public var list : Array<Class<Dynamic>> = [
-	#if (!neko || haxe_ver >= "3.3")
 	MacroExecutorTest, 
 	MacroTest
-	#end
 	];
 }
diff --git a/test/hex/control/macro/MacroExecutorTest.hx b/test/hex/control/macro/MacroExecutorTest.hx
@@ -1,13 +1,11 @@
 package hex.control.macro;
 
-#if (!neko || haxe_ver >= "3.3")
 import haxe.Timer;
 import hex.MockDependencyInjector;
 import hex.control.Request;
 import hex.control.async.AsyncCommand;
 import hex.control.async.IAsyncCommand;
 import hex.control.async.IAsyncCommandListener;
-import hex.control.command.BasicCommand;
 import hex.control.command.CommandMapping;
 import hex.control.command.ICommand;
 import hex.control.command.ICommandMapping;
@@ -378,5 +376,4 @@ private class MockImplementation implements IMockType
 private interface IMockType
 {
 
-}
-#end
+}
diff --git a/test/hex/control/macro/MacroTest.hx b/test/hex/control/macro/MacroTest.hx
@@ -24,7 +24,6 @@ import hex.unittest.runner.MethodRunner;
  */
 class MacroTest
 {
-	#if (!neko || haxe_ver >= "3.3")
 	var _macro 			: Macro;
 	var _macroExecutor 	: MockMacroExecutor;
 
@@ -276,7 +275,6 @@ class MacroTest
 
 		Assert.equals( request, myMacro.requestPassedDuringExecution, "request should be available from prepare" );
 	}
-	#end
 }
 
 private class MockMacroExecutor implements IMacroExecutor

diff --git a/test/hex/control/macro/MockAsyncCommand.hx b/test/hex/control/macro/MockAsyncCommand.hx
@@ -1,6 +1,5 @@
 package hex.control.macro;
 
-#if (!neko || haxe_ver >= "3.3")
 import haxe.Timer;
 import hex.control.async.AsyncCommand;
 
@@ -14,5 +13,4 @@ class MockAsyncCommand extends AsyncCommand
 	{
 		Timer.delay( this._handleComplete, 50 );
 	}
-}
-#end
+}
diff --git a/test/hex/control/macro/MockAsyncCommandForTestingExecution.hx b/test/hex/control/macro/MockAsyncCommandForTestingExecution.hx
@@ -1,6 +1,5 @@
 package hex.control.macro;
 
-#if (!neko || haxe_ver >= "3.3")
 import hex.control.async.AsyncCommand;
 import hex.module.IModule;
 
@@ -48,5 +47,4 @@ class MockAsyncCommandForTestingExecution extends MockBasicAsyncCommand
 	{
 		MockAsyncCommandForTestingExecution.cancelHandlers.push( callback );
 	}
-}
-#end
+}
diff --git a/test/hex/control/macro/MockBasicAsyncCommand.hx b/test/hex/control/macro/MockBasicAsyncCommand.hx
@@ -1,6 +1,5 @@
 package hex.control.macro;
 
-#if (!neko || haxe_ver >= "3.3")
 import haxe.Timer;
 import hex.control.async.AsyncCommand;
 
@@ -14,5 +13,4 @@ class MockBasicAsyncCommand extends AsyncCommand
 	{
 		Timer.delay( this._handleComplete, 50 );
 	}
-}
-#end
+}
diff --git a/test/hex/control/macro/MockMacro.hx b/test/hex/control/macro/MockMacro.hx
@@ -8,9 +8,7 @@ class MockMacro extends Macro
 {
 	override function _prepare() : Void
 	{
-		#if (!neko || haxe_ver >= "3.3")
 		this.add( MockAsyncCommand );
-		#end
 		this.add( MockCommand );
 	}
 }
diff --git a/test/hex/control/macro/MockMacroWithHandler.hx b/test/hex/control/macro/MockMacroWithHandler.hx
@@ -1,6 +1,5 @@
 package hex.control.macro;
 
-#if (!neko || haxe_ver >= "3.3")
 import hex.control.async.IAsyncCommand;
 
 /**
@@ -18,5 +17,4 @@ class MockMacroWithHandler extends Macro
 	{
 		this.add( MockCommand );
 	}
-}
-#end
+}
diff --git a/test/hex/control/trigger/CommandTriggerTest.hx b/test/hex/control/trigger/CommandTriggerTest.hx
@@ -1,8 +1,6 @@
 package hex.control.trigger;
 
-#if ( haxe_ver >= "3.3" )
 import hex.collection.Locator;
-import hex.control.async.Nothing;
 import hex.control.trigger.MockCommandClassWithParameters;
 import hex.control.trigger.MockCommandClassWithoutParameters;
 import hex.control.trigger.mock.MockController;
@@ -12,11 +10,7 @@ import hex.control.trigger.mock.MockMacroCommand;
 import hex.control.trigger.mock.MockMacroController;
 import hex.control.trigger.mock.MockModule;
 import hex.di.IDependencyInjector;
-import hex.di.IInjectorListener;
 import hex.di.Injector;
-import hex.di.provider.IDependencyProvider;
-import hex.domain.Domain;
-import hex.event.MessageType;
 import hex.log.ILogger;
 import hex.module.IModule;
 import hex.unittest.assertion.Assert;
@@ -166,12 +160,4 @@ class CommandTriggerTest
 		Assert.equals( vos[ 7 ], acmd.pStringMap );
 		Assert.equals( vos[ 8 ], acmd.pDate );
 	}
-}
-#else
-
-class CommandTriggerTest
-{
-	public function new(){}
-}
-
-#end
+}
diff --git a/test/hex/control/trigger/MVCTriggerSuite.hx b/test/hex/control/trigger/MVCTriggerSuite.hx
@@ -8,11 +8,9 @@ class MVCTriggerSuite
 {
 	@Suite( "Trigger" )
     public var list : Array<Class<Dynamic>> = 
-	[ 
-		#if ( haxe_ver >= "3.3" )
+	[
 		CommandTriggerTest, 
 		CommandTriggerUserCaseTest,
-		#end
 		MacroCommandTest 
 	];
 }
diff --git a/test/hex/control/trigger/mock/MockController.hx b/test/hex/control/trigger/mock/MockController.hx
@@ -1,6 +1,5 @@
 package hex.control.trigger.mock;
 
-#if ( haxe_ver >= "3.3" )
 import hex.collection.Locator;
 import hex.control.async.Expect;
 import hex.control.async.Nothing;
@@ -31,5 +30,4 @@ class MockController
 	{ 
 		return a + b;
 	}
-}
-#end
+}
diff --git a/test/hex/control/trigger/mock/MockMacroController.hx b/test/hex/control/trigger/mock/MockMacroController.hx
@@ -1,6 +1,5 @@
 package hex.control.trigger.mock;
 
-#if ( haxe_ver >= "3.3" )
 import hex.collection.ILocator;
 import hex.control.async.Expect;
 
@@ -41,5 +40,4 @@ class MockMacroController
 													sender 		: CommandTriggerTest, 
 													locator 	: ILocator<String,Bool>
 						) : Expect<String>;
-}
-#end
+}
diff --git a/test/hex/event/MVCEventSuite.hx b/test/hex/event/MVCEventSuite.hx
@@ -7,9 +7,10 @@ package hex.event;
 class MVCEventSuite
 {
 	@Suite("event")
-    public var list : Array<Class<Dynamic>> = [CallbackAdapterTest, ClassAdapterTest, EventProxyTest
-	#if (!neko || haxe_ver >= "3.3")
-	, MacroAdapterStrategyTest
-	#end
+    public var list : Array<Class<Dynamic>> = [
+		CallbackAdapterTest,
+		ClassAdapterTest,
+		EventProxyTest,
+		MacroAdapterStrategyTest
 	];
 }
diff --git a/test/hex/event/MacroAdapterStrategyTest.hx b/test/hex/event/MacroAdapterStrategyTest.hx
@@ -1,6 +1,5 @@
 package hex.event;
 
-#if (!neko || haxe_ver >= "3.3")
 import haxe.Timer;
 import hex.control.macro.MacroExecutor;
 import hex.di.Injector;
@@ -49,5 +48,4 @@ class MacroAdapterStrategyTest
 		Assert.equals( "test", this._result[ 0 ] );
 	}
 
-}
-#end
+}
diff --git a/test/hex/event/MockAdapterStrategyCommand.hx b/test/hex/event/MockAdapterStrategyCommand.hx
@@ -1,6 +1,5 @@
 package hex.event;
 
-#if (!neko || haxe_ver >= "3.3")
 import haxe.Timer;
 import hex.control.async.AsyncCommand;
 
@@ -32,5 +31,4 @@ class MockAdapterStrategyCommand extends AsyncCommand
 	{
 		this._handleComplete();
 	}
-}
-#end
+}