This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch feature/Merge_MXRoyale_To_Develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit ccd51fb38cc5e70025d5cabb57756d7e037a8761 Author: Alex Harui <[email protected]> AuthorDate: Thu Aug 30 09:49:36 2018 -0700 fix up poms --- frameworks/projects/MXRoyale/pom.xml | 97 ++++++++++++++++++++++++++++++++- frameworks/projects/SparkRoyale/pom.xml | 44 ++++++++++++--- frameworks/projects/TLF/pom.xml | 23 +++++++- pom.xml | 2 + 4 files changed, 156 insertions(+), 10 deletions(-) diff --git a/frameworks/projects/MXRoyale/pom.xml b/frameworks/projects/MXRoyale/pom.xml index cac6dea..6a78fe8 100644 --- a/frameworks/projects/MXRoyale/pom.xml +++ b/frameworks/projects/MXRoyale/pom.xml @@ -56,9 +56,13 @@ <name>GOOG::DEBUG</name> <value>true</value> </define> + <define> + <name>ROYALE::DISPLAYOBJECT</name> + <value>IUIComponent</value> + </define> </defines> <allowSubclassOverrides>true</allowSubclassOverrides> - <additionalCompilerOptions>-js-compiler-define=COMPILE::JS,true;-js-compiler-define=COMPILE::SWF,false;-js-compiler-define=GOOG::DEBUG,goog.DEBUG</additionalCompilerOptions> + <additionalCompilerOptions>-js-compiler-define=COMPILE::JS,true;-js-compiler-define=COMPILE::SWF,false;-js-compiler-define=GOOG::DEBUG,goog.DEBUG;-js-compiler-define=ROYALE::DISPLAYOBJECT,IUIComponent</additionalCompilerOptions> </configuration> </plugin> </plugins> @@ -67,6 +71,20 @@ <dependencies> <dependency> <groupId>org.apache.royale.framework</groupId> + <artifactId>Binding</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Binding</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> <version>0.9.3-SNAPSHOT</version> <type>swc</type> @@ -95,6 +113,48 @@ </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> + <artifactId>Graphics</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Graphics</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Collections</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Collections</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>DragDrop</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>DragDrop</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> <artifactId>Express</artifactId> <version>0.9.3-SNAPSHOT</version> <type>swc</type> @@ -135,6 +195,41 @@ <type>swc</type> <classifier>js</classifier> </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Network</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Network</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Reflection</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Reflection</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>XML</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> </dependencies> </project> diff --git a/frameworks/projects/SparkRoyale/pom.xml b/frameworks/projects/SparkRoyale/pom.xml index f0de97a..ac99633 100644 --- a/frameworks/projects/SparkRoyale/pom.xml +++ b/frameworks/projects/SparkRoyale/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>org.apache.royale.framework</groupId> <artifactId>projects</artifactId> - <version>0.9.2-SNAPSHOT</version> + <version>0.9.3-SNAPSHOT</version> </parent> <artifactId>SparkRoyale</artifactId> - <version>0.9.2-SNAPSHOT</version> + <version>0.9.3-SNAPSHOT</version> <packaging>swc</packaging> <name>Apache Royale: Framework: Libs: SparkRoyale</name> @@ -68,42 +68,70 @@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> - <version>0.9.2-SNAPSHOT</version> + <version>0.9.3-SNAPSHOT</version> <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> - <version>0.9.2-SNAPSHOT</version> + <version>0.9.3-SNAPSHOT</version> <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> - <version>0.9.2-SNAPSHOT</version> + <version>0.9.3-SNAPSHOT</version> <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> - <version>0.9.2-SNAPSHOT</version> + <version>0.9.3-SNAPSHOT</version> <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>MXRoyale</artifactId> - <version>0.9.2-SNAPSHOT</version> + <version>0.9.3-SNAPSHOT</version> <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>MXRoyale</artifactId> - <version>0.9.2-SNAPSHOT</version> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Text</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Text</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>TLF</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>TLF</artifactId> + <version>0.9.3-SNAPSHOT</version> <type>swc</type> <classifier>js</classifier> </dependency> diff --git a/frameworks/projects/TLF/pom.xml b/frameworks/projects/TLF/pom.xml index ccd3897..0904bce 100644 --- a/frameworks/projects/TLF/pom.xml +++ b/frameworks/projects/TLF/pom.xml @@ -53,7 +53,7 @@ </namespace> </namespaces> <includeClasses> - <includeClass>TextClasses</includeClass> + <includeClass>TLFClasses</includeClass> </includeClasses> <includeFiles> <include-file> @@ -93,6 +93,27 @@ <type>swc</type> <classifier>js</classifier> </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Reflection</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Reflection</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>XML</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> </dependencies> </project> diff --git a/pom.xml b/pom.xml index f4fb04c..d2c97ed 100644 --- a/pom.xml +++ b/pom.xml @@ -211,6 +211,8 @@ <exclude>**/.idea/**</exclude> <!-- SASS cc.map generated files by sass-maven-plugin--> <exclude>**/*.css.map</exclude> + <!-- swfobject.js is MIT License--> + <exclude>**/swfobject.js</exclude> <!-- Exclude any eventually existing content of target directories. Some times when building with a bigger maven reactor and then
