You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/08/30 17:07:16 UTC
[royale-asjs] 03/03: Merge branch 'feature/MXRoyale' into
feature/Merge_MXRoyale_To_Develop
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 fede641b2633534c0fcbacc90a23d9cdb2ab1a2e
Merge: 7ababd1 ccd51fb
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Aug 30 10:06:55 2018 -0700
Merge branch 'feature/MXRoyale' into feature/Merge_MXRoyale_To_Develop
basictests.txt | 175782 ------------------
frameworks/projects/MXRoyale/pom.xml | 69 +-
.../MXRoyale/src/main/royale/mx/controls/Button.as | 11 -
frameworks/projects/SparkRoyale/pom.xml | 28 +
frameworks/projects/TLF/pom.xml | 23 +-
5 files changed, 111 insertions(+), 175802 deletions(-)
diff --cc frameworks/projects/MXRoyale/pom.xml
index 409f4f8,6a78fe8..2de4ed7
--- a/frameworks/projects/MXRoyale/pom.xml
+++ b/frameworks/projects/MXRoyale/pom.xml
@@@ -122,61 -182,54 +182,54 @@@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Charts</artifactId>
- <version>0.9.3-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Charts</artifactId>
- <version>0.9.3-SNAPSHOT</version>
- <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>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Charts</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Charts</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>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>XML</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <type>swc</type>
- <classifier>swf</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>