Repository: flex-asjs Updated Branches: refs/heads/develop 88f0bcbe0 -> b00c575f1
try to fix checkintests Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b00c575f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b00c575f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b00c575f Branch: refs/heads/develop Commit: b00c575f14a15c063976aecf74775724886f2335 Parents: 88f0bcb Author: Alex Harui <[email protected]> Authored: Wed May 3 21:51:40 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Wed May 3 21:51:49 2017 -0700 ---------------------------------------------------------------------- build.xml | 6 +++--- mustella/tests/basicTests/halo/scripts/ButtonTestScript.mxml | 3 +-- mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml | 3 +-- mustella/tests/basicTests/shim/VBox.as | 5 +---- 4 files changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b00c575f/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 11b8027..43b4085 100644 --- a/build.xml +++ b/build.xml @@ -1408,11 +1408,11 @@ <include name="frameworks/libs/framework.swc"/> <include name="frameworks/locale/en_US/framework_rb.swc"/> </swf-library-path> - <js-external-library-path dir="${env.PLAYERGLOBAL_HOME}"> - <include name="${playerglobal.version}/playerglobal.swc"/> + <js-external-library-path dir="${basedir}"> + <include name="js/libs/js.swc"/> </js-external-library-path> <js-library-path dir="${basedir}" > - <include name="frameworks/libs"/> + <include name="frameworks/js/FlexJS/libs"/> </js-library-path> <js-library-path dir="${FLEX_SDK_HOME}" append="true"> <include name="mustella/mustella.swc"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b00c575f/mustella/tests/basicTests/halo/scripts/ButtonTestScript.mxml ---------------------------------------------------------------------- diff --git a/mustella/tests/basicTests/halo/scripts/ButtonTestScript.mxml b/mustella/tests/basicTests/halo/scripts/ButtonTestScript.mxml index 3354c93..7173cbe 100644 --- a/mustella/tests/basicTests/halo/scripts/ButtonTestScript.mxml +++ b/mustella/tests/basicTests/halo/scripts/ButtonTestScript.mxml @@ -22,8 +22,7 @@ <!-- this set of lines form a template that must be in each unit test --> <mx:Script> <![CDATA[ - import flash.display.DisplayObject; - public static function init(o:DisplayObject):void + public static function init(o:Object):void { } ]]> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b00c575f/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml ---------------------------------------------------------------------- diff --git a/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml b/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml index 77983cd..4be7f0a 100644 --- a/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml +++ b/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml @@ -22,8 +22,7 @@ <!-- this set of lines form a template that must be in each unit test --> <mx:Script> <![CDATA[ - import flash.display.DisplayObject; - public static function init(o:DisplayObject):void + public static function init(o:Object):void { } ]]> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b00c575f/mustella/tests/basicTests/shim/VBox.as ---------------------------------------------------------------------- diff --git a/mustella/tests/basicTests/shim/VBox.as b/mustella/tests/basicTests/shim/VBox.as index df94727..9f2aef6 100644 --- a/mustella/tests/basicTests/shim/VBox.as +++ b/mustella/tests/basicTests/shim/VBox.as @@ -17,10 +17,7 @@ // //////////////////////////////////////////////////////////////////////////////// package shim -{ - import flash.display.DisplayObject; - import flash.display.DisplayObjectContainer; - +{ import org.apache.flex.html.Container; import org.apache.flex.html.beads.layouts.VerticalLayout;
