You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/03/22 10:23:33 UTC
[royale-asjs] branch develop updated: - Updated the pom of the
ColorChooser example, but commented it out in the example-reactor.
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 cb3c754 - Updated the pom of the ColorChooser example, but commented it out in the example-reactor.
new 402dcc9 Merge pull request #772 from chrisdutz/develop
cb3c754 is described below
commit cb3c75433d6994ee51d67222ef1784414e966467
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Mar 22 11:20:43 2020 +0100
- Updated the pom of the ColorChooser example, but commented it out in the example-reactor.
---
examples/royale/ColorPickerExample/pom.xml | 43 +++++++++++-------------------
examples/royale/pom.xml | 6 ++---
2 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/examples/royale/ColorPickerExample/pom.xml b/examples/royale/ColorPickerExample/pom.xml
index 8119d07..335d41b 100644
--- a/examples/royale/ColorPickerExample/pom.xml
+++ b/examples/royale/ColorPickerExample/pom.xml
@@ -51,33 +51,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>${flash.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -86,6 +59,7 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
+
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>BasicTheme</artifactId>
@@ -95,4 +69,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/pom.xml b/examples/royale/pom.xml
index 26f006a..1721170 100644
--- a/examples/royale/pom.xml
+++ b/examples/royale/pom.xml
@@ -39,12 +39,13 @@
<module>AlertExample</module>
<module>ASDoc</module>
<module>ChartExample</module>
- <module>ColorPickerExample</module>
+ <!-- Causing a compile error -->
+ <!--module>ColorPickerExample</module-->
<module>CordovaCameraExample</module>
<module>CreateJSExample</module>
<module>CreditCardValidatorExample</module>
<module>DataBindingExample</module>
- <module>DataBindingExample_as</module><!-- Flash error -->
+ <module>DataBindingExample_as</module>
<module>DataBindingExample_Flat</module>
<module>DataBindingExampleWithFlexLayout</module>
<module>DataGridExample</module>
@@ -84,7 +85,6 @@
<module>TeamPage</module>
<module>TodoListSampleApp</module>
<module>TreeExample</module>
-
</modules>
<build>