You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2021/10/09 03:49:15 UTC
[royale-asjs] 03/03: Crux-related conversion to MXRoyaleBase (as
opposed to MXRoyale) dependency
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 b3ce8d4e24f8333dc47e0958a2b8645fc115a756
Author: greg-dove <gr...@gmail.com>
AuthorDate: Sat Oct 9 16:21:43 2021 +1300
Crux-related conversion to MXRoyaleBase (as opposed to MXRoyale) dependency
---
examples/crux/CruxGitHubCommitLogViewer/pom.xml | 2 +-
.../src/main/config/compile-app-config.xml | 6 +++---
examples/crux/CruxQuickStart/pom.xml | 2 +-
.../crux/CruxQuickStart/src/main/config/compile-app-config.xml | 2 +-
examples/crux/CruxQuickStartBasic/pom.xml | 2 +-
examples/crux/pom.xml | 9 ++++++++-
examples/crux/todomvc-jewel-crux/pom.xml | 2 +-
.../js/projects/CruxJS/src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/Crux/pom.xml | 4 ++--
frameworks/projects/Crux/src/main/config/compile-swf-config.xml | 2 +-
10 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/examples/crux/CruxGitHubCommitLogViewer/pom.xml b/examples/crux/CruxGitHubCommitLogViewer/pom.xml
index d621885..064e7e1 100644
--- a/examples/crux/CruxGitHubCommitLogViewer/pom.xml
+++ b/examples/crux/CruxGitHubCommitLogViewer/pom.xml
@@ -44,7 +44,7 @@
<additionalCompilerOptions>
-js-default-initializers=true;
-source-map=true;
- -compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css;
+ <!-- removed because now using MXRoyaleBase: -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/CruxGitHubCommitLogViewer/src/main/config/compile-app-config.xml b/examples/crux/CruxGitHubCommitLogViewer/src/main/config/compile-app-config.xml
index 84451ba..7210b68 100644
--- a/examples/crux/CruxGitHubCommitLogViewer/src/main/config/compile-app-config.xml
+++ b/examples/crux/CruxGitHubCommitLogViewer/src/main/config/compile-app-config.xml
@@ -49,7 +49,7 @@
<js-library-path append="true">
<path-element>../../../../../../frameworks/js/libs/BasicJS.swc</path-element>
<path-element>../../../../../../frameworks/js/libs/CruxJS.swc</path-element>
- <path-element>../../../../../../frameworks/js/libs/MXRoyaleJS.swc</path-element>
+ <path-element>../../../../../../frameworks/js/libs/MXRoyaleBaseJS.swc</path-element>
</js-library-path>
<!--
<library-path append="true">
@@ -58,8 +58,8 @@
<path-element>../../../../../../frameworks/libs/MXRoyale.swc</path-element>
</library-path>
-->
- <exclude-defaults-css-files>
+ <!--<exclude-defaults-css-files>
<filename>MXRoyaleJS.swc:defaults.css</filename>
- </exclude-defaults-css-files>
+ </exclude-defaults-css-files>-->
</compiler>
</royale-config>
diff --git a/examples/crux/CruxQuickStart/pom.xml b/examples/crux/CruxQuickStart/pom.xml
index 57b9ec0..65c2945 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=MXRoyale-${royale.framework.version}-js.swc:defaults.css;
+ <!-- removed because now using MXRoyaleBase: -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/CruxQuickStart/src/main/config/compile-app-config.xml b/examples/crux/CruxQuickStart/src/main/config/compile-app-config.xml
index 55973a2..d9162f5 100644
--- a/examples/crux/CruxQuickStart/src/main/config/compile-app-config.xml
+++ b/examples/crux/CruxQuickStart/src/main/config/compile-app-config.xml
@@ -45,7 +45,7 @@
<js-library-path append="true">
<path-element>../../../../../../frameworks/js/libs/BasicJS.swc</path-element>
<path-element>../../../../../../frameworks/js/libs/CruxJS.swc</path-element>
- <path-element>../../../../../../frameworks/js/libs/MXRoyaleJS.swc</path-element>
+ <path-element>../../../../../../frameworks/js/libs/MXRoyaleBaseJS.swc</path-element>
</js-library-path>
<!--<library-path append="true">
<path-element>../../../../../../frameworks/libs/Basic.swc</path-element>
diff --git a/examples/crux/CruxQuickStartBasic/pom.xml b/examples/crux/CruxQuickStartBasic/pom.xml
index baff7ab..d15f152 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=MXRoyale-${royale.framework.version}-js.swc:defaults.css;
+ <!-- removed because now using MXRoyaleBase: -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/pom.xml b/examples/crux/pom.xml
index a415fae..9af3fc2 100644
--- a/examples/crux/pom.xml
+++ b/examples/crux/pom.xml
@@ -122,6 +122,13 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>MXRoyaleBase</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>Network</artifactId>
<version>0.9.9-SNAPSHOT</version>
<type>swc</type>
@@ -205,7 +212,7 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
+ <artifactId>MXRoyaleBase</artifactId>
<version>0.9.9-SNAPSHOT</version>
<type>swc</type>
<classifier>swf</classifier>
diff --git a/examples/crux/todomvc-jewel-crux/pom.xml b/examples/crux/todomvc-jewel-crux/pom.xml
index d32c7b7..4e4e704 100644
--- a/examples/crux/todomvc-jewel-crux/pom.xml
+++ b/examples/crux/todomvc-jewel-crux/pom.xml
@@ -46,7 +46,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=MXRoyale-${royale.framework.version}-js.swc:defaults.css;
+ <!-- removed because now using MXRoyaleBase: -compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css; -->
-export-public-symbols=false
-prevent-rename-protected-symbols=false
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 eec94da..6364a62 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
@@ -64,7 +64,7 @@
<path-element>../../../../../libs/BindingJS.swc</path-element>
<path-element>../../../../../libs/NetworkJS.swc</path-element>
<path-element>../../../../../libs/ReflectionJS.swc</path-element>
- <path-element>../../../../../libs/MXRoyaleJS.swc</path-element>
+ <path-element>../../../../../libs/MXRoyaleBaseJS.swc</path-element>
<path-element>../../../../../libs/StorageJS.swc</path-element>
</external-library-path>
diff --git a/frameworks/projects/Crux/pom.xml b/frameworks/projects/Crux/pom.xml
index 4eb112c..85b8d41 100644
--- a/frameworks/projects/Crux/pom.xml
+++ b/frameworks/projects/Crux/pom.xml
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
+ <artifactId>MXRoyaleBase</artifactId>
<version>0.9.9-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
@@ -153,7 +153,7 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
+ <artifactId>MXRoyaleBase</artifactId>
<version>0.9.9-SNAPSHOT</version>
<type>swc</type>
<classifier>swf</classifier>
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 ce2d387..255a72b 100644
--- a/frameworks/projects/Crux/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/Crux/src/main/config/compile-swf-config.xml
@@ -35,7 +35,7 @@
<path-element>../../../../../libs/Basic.swc</path-element>
<path-element>../../../../../libs/Network.swc</path-element>
<path-element>../../../../../libs/Reflection.swc</path-element>
- <path-element>../../../../../libs/MXRoyale.swc</path-element>
+ <path-element>../../../../../libs/MXRoyaleBase.swc</path-element>
<path-element>../../../../../libs/Storage.swc</path-element>
</external-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>