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/09/05 19:22:25 UTC
[royale-asjs] branch develop updated:
royale-simple-application-archetype: update maven archetype to be usable
nowadays
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 bf40e74 royale-simple-application-archetype: update maven archetype to be usable nowadays
bf40e74 is described below
commit bf40e74dc61f1198304b1c63cfa54406e735ea2f
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Sep 5 21:22:14 2020 +0200
royale-simple-application-archetype: update maven archetype to be usable nowadays
---
.../main/resources/META-INF/maven/archetype.xml | 1 -
.../archetype-resources/.mvn/extensions.xml | 30 ----------------------
.../src/main/resources/archetype-resources/pom.xml | 29 ++++++++++++++++-----
.../archetype-resources/src/main/royale/App.mxml | 2 +-
4 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/archetypes/royale-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/royale-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
index 5b6edc3..95062bb 100644
--- a/archetypes/royale-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ b/archetypes/royale-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -22,7 +22,6 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>royale-simple-application-archetype</id>
<resources>
- <resource>.mvn/extensions.xml</resource>
<resource>src/main/royale/App.mxml</resource>
</resources>
</archetype>
diff --git a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/.mvn/extensions.xml b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/.mvn/extensions.xml
deleted file mode 100644
index c1d6e9d..0000000
--- a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/.mvn/extensions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
-
- <extension>
- <groupId>org.apache.royale.utilities.converter</groupId>
- <artifactId>flex-sdk-converter-maven-extension</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </extension>
-
-</extensions>
diff --git a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
index 538eb97..30cad2e 100644
--- a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -41,7 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>App.mxml</mainClass>
- <targets>SWF,JSRoyale</targets>
+ <targets>JSRoyale,SWF</targets>
</configuration>
<dependencies>
<dependency>
@@ -51,6 +51,11 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ </plugin>
</plugins>
</build>
@@ -62,13 +67,11 @@
<type>swc</type>
</dependency>
- <!-- Needed for Flash compilation -->
<dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>${flash.version}</version>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.8-SNAPSHOT</version>
<type>swc</type>
- <scope>provided</scope>
</dependency>
<!-- Needed for JavaScript compilation -->
@@ -94,6 +97,20 @@
<compiler.debug>false</compiler.debug>
</properties>
</profile>
+
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <!-- Needed for Flash compilation -->
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>20.0</version>
+ <type>swc</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/src/main/royale/App.mxml b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/src/main/royale/App.mxml
index 534b7af..acd6ed3 100644
--- a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/src/main/royale/App.mxml
+++ b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/src/main/royale/App.mxml
@@ -18,7 +18,7 @@ limitations under the License.
-->
<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:js="library://ns.apache.org/royale/basic" >
+ xmlns:js="library://ns.apache.org/royale/basic" >
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>