This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit c00b69338f256b89ce50e488b7880dda3e9f974e Author: greg-dove <[email protected]> AuthorDate: Wed Jul 17 11:20:28 2019 +1200 Updates for crux configs following Josh' recent compiler changes Minor tweaks (@royalesuppresspublicvarwarning) in crux examples --- .../main/royale/crux/controller/ConfigurationController.as | 4 +++- .../src/main/royale/crux/event/ServiceEvent.as | 2 +- .../js/projects/CruxJS/src/main/config/compile-js-config.xml | 12 +++++------- .../projects/Crux/src/main/config/compile-swf-config.xml | 5 ++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/examples/crux/GitHubCommitLogViewer/src/main/royale/crux/controller/ConfigurationController.as b/examples/crux/GitHubCommitLogViewer/src/main/royale/crux/controller/ConfigurationController.as index c33eff0..52bf034 100644 --- a/examples/crux/GitHubCommitLogViewer/src/main/royale/crux/controller/ConfigurationController.as +++ b/examples/crux/GitHubCommitLogViewer/src/main/royale/crux/controller/ConfigurationController.as @@ -22,7 +22,9 @@ package crux.controller import crux.service.ConfigurationDelegate; import mx.rpc.events.ResultEvent; import org.apache.royale.crux.utils.services.ServiceHelper; - + /** + * @royalesuppresspublicvarwarning + */ public class ConfigurationController { [Inject] diff --git a/examples/crux/GitHubCommitLogViewer/src/main/royale/crux/event/ServiceEvent.as b/examples/crux/GitHubCommitLogViewer/src/main/royale/crux/event/ServiceEvent.as index c0546f9..6476d7e 100644 --- a/examples/crux/GitHubCommitLogViewer/src/main/royale/crux/event/ServiceEvent.as +++ b/examples/crux/GitHubCommitLogViewer/src/main/royale/crux/event/ServiceEvent.as @@ -22,7 +22,7 @@ package crux.event import org.apache.royale.events.Event; /** - * @royalesuppresspublicwarning + * @royalesuppresspublicvarwarning */ public class ServiceEvent extends Event { diff --git a/frameworks/js/projects/CruxJS/src/main/config/compile-js-config.xml b/frameworks/js/projects/CruxJS/src/main/config/compile-js-config.xml index f9cdf71..50f2bab 100644 --- a/frameworks/js/projects/CruxJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/projects/CruxJS/src/main/config/compile-js-config.xml @@ -54,20 +54,18 @@ <locale/> - <!-- overwrite the default library-path setting --> - <library-path> + <external-library-path append="true"> <path-element>../../../../../../../js/libs/GCL.swc</path-element> - <!-- asjscompc won't 'link' these classes in, but will list their requires - if these swcs are on the external-library-path then their requires - will not be listed --> + <path-element>../../../../../libs/LanguageJS.swc</path-element> + <path-element>../../../../../libs/XMLJS.swc</path-element> <path-element>../../../../../libs/CoreJS.swc</path-element> <path-element>../../../../../libs/BasicJS.swc</path-element> <path-element>../../../../../libs/BindingJS.swc</path-element> - <path-element>../../../../../libs/MXRoyaleJS.swc</path-element> <path-element>../../../../../libs/NetworkJS.swc</path-element> <path-element>../../../../../libs/ReflectionJS.swc</path-element> - </library-path> + <path-element>../../../../../libs/MXRoyaleJS.swc</path-element> + </external-library-path> <namespaces> <namespace> diff --git a/frameworks/projects/Crux/src/main/config/compile-swf-config.xml b/frameworks/projects/Crux/src/main/config/compile-swf-config.xml index 945538e..64f4678 100644 --- a/frameworks/projects/Crux/src/main/config/compile-swf-config.xml +++ b/frameworks/projects/Crux/src/main/config/compile-swf-config.xml @@ -30,14 +30,13 @@ <external-library-path> <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> + <path-element>../../../../../libs/Binding.swc</path-element> <path-element>../../../../../libs/Core.swc</path-element> <path-element>../../../../../libs/Basic.swc</path-element> - <path-element>../../../../../libs/Binding.swc</path-element> - <path-element>../../../../../libs/MXRoyale.swc</path-element> <path-element>../../../../../libs/Network.swc</path-element> <path-element>../../../../../libs/Reflection.swc</path-element> + <path-element>../../../../../libs/MXRoyale.swc</path-element> </external-library-path> - <allow-subclass-overrides>true</allow-subclass-overrides> <mxml>
