This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push: new 46c66b4 maven: fix MXRoyale exclusion in examples and archetypes since are not distribution and use maven artifact with version included 46c66b4 is described below commit 46c66b42ff07e4226f0a060c361faa9348c5b870 Author: Carlos Rovira <carlos.rov...@apache.org> AuthorDate: Tue Mar 2 13:21:30 2021 +0100 maven: fix MXRoyale exclusion in examples and archetypes since are not distribution and use maven artifact with version included --- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/__application__/pom.xml | 2 +- .../src/main/resources/archetype-resources/__module__/pom.xml | 2 +- examples/crux/CruxQuickStart/pom.xml | 2 +- examples/crux/CruxQuickStartBasic/pom.xml | 2 +- examples/crux/todomvc-jewel-crux/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml index 4f63548..b425971 100644 --- a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml @@ -56,7 +56,7 @@ -source-map=true; #if (${includeCrux} == 'true' || ${includeCrux} == 'yes' || ${includeCrux} == 'y') -js-default-initializers=true; - -compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css; + -compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css; -keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient; -keep-code-with-metadata=Inject; #end diff --git a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml index cabb345..d784333 100644 --- a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml +++ b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml @@ -51,7 +51,7 @@ -js-compiler-option+=--property_map_output_file gccprops.txt; #if (${includeCrux} == 'true' || ${includeCrux} == 'yes' || ${includeCrux} == 'y') -js-default-initializers=true; - -compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css; + -compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css; -keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient; -keep-code-with-metadata=Inject; #end diff --git a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml index b53ec19..3700718 100644 --- a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml +++ b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml @@ -50,7 +50,7 @@ -js-compiler-option+=--property_map_input_file ../../../../../${application}/target/javascript/bin/js-release/gccprops.txt #if (${includeCrux} == 'true' || ${includeCrux} == 'yes' || ${includeCrux} == 'y') -js-default-initializers=true; - -compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css; + -compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css; -keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient; -keep-code-with-metadata=Inject; #end diff --git a/examples/crux/CruxQuickStart/pom.xml b/examples/crux/CruxQuickStart/pom.xml index 869b19b..c912b1e 100644 --- a/examples/crux/CruxQuickStart/pom.xml +++ b/examples/crux/CruxQuickStart/pom.xml @@ -44,7 +44,7 @@ <additionalCompilerOptions> -js-default-initializers=true; -source-map=true; - -compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css; + -compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css; -keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient; -keep-code-with-metadata=Inject; </additionalCompilerOptions> diff --git a/examples/crux/CruxQuickStartBasic/pom.xml b/examples/crux/CruxQuickStartBasic/pom.xml index f47da98..cb107cc 100644 --- a/examples/crux/CruxQuickStartBasic/pom.xml +++ b/examples/crux/CruxQuickStartBasic/pom.xml @@ -45,7 +45,7 @@ <additionalCompilerOptions> -js-default-initializers=true; -source-map=true; - -compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css; + -compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css; -keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient; -keep-code-with-metadata=Inject; </additionalCompilerOptions> diff --git a/examples/crux/todomvc-jewel-crux/pom.xml b/examples/crux/todomvc-jewel-crux/pom.xml index 41a1971..f87a581 100644 --- a/examples/crux/todomvc-jewel-crux/pom.xml +++ b/examples/crux/todomvc-jewel-crux/pom.xml @@ -47,7 +47,7 @@ -js-default-initializers=true; -keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient; -source-map=true; - -compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css; + -compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css; -export-public-symbols=false -prevent-rename-protected-symbols=false