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 2019/11/22 09:07:39 UTC

[royale-asjs] branch develop updated: - Tried to fix the no-adobe-deps build.

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 ad1a3ea  - Tried to fix the no-adobe-deps build.
     new 22d5ddd  Merge pull request #579 from chrisdutz/develop
ad1a3ea is described below

commit ad1a3ea59d9c910678be45038049276dc90ab0db
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Nov 22 00:12:55 2019 +0100

    - Tried to fix the no-adobe-deps build.
---
 frameworks/themes/pom.xml | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/frameworks/themes/pom.xml b/frameworks/themes/pom.xml
index 54d3930..79a9c37 100644
--- a/frameworks/themes/pom.xml
+++ b/frameworks/themes/pom.xml
@@ -33,6 +33,10 @@
 
   <name>Apache Royale: Framework: Themes</name>
 
+  <properties>
+    <project.compiler.options>${repo.compiler.options}-js-default-initializers=false;-source-map=${source.map};-js-complex-implicit-coercions=false;-js-vector-index-checks=false;-js-resolve-uncertain=false</project.compiler.options>
+  </properties>
+
   <modules>
     <module>Basic</module>
     <module>MDL</module>
@@ -117,18 +121,27 @@
     <module>Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme</module>
     <module>Jewel-Dark-NoFlat-Emphasized-Violet-Theme</module>
     <module>Jewel-Dark-NoFlat-Emphasized-Yellow-Theme</module>
-
   </modules>
 
-  <dependencies>
-    <dependency>
-      <groupId>com.adobe.air.framework</groupId>
-      <artifactId>airglobal</artifactId>
-      <version>${air.version}</version>
-      <type>swc</type>
-      <scope>provided</scope>
-    </dependency>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.royale.compiler</groupId>
+        <artifactId>royale-maven-plugin</artifactId>
+        <configuration>
+          <!-- We don't want dependencies to be linked into the resulting libraries -->
+          <forceSwcExternalLibraryPath>true</forceSwcExternalLibraryPath>
+          <additionalCompilerOptions>${project.compiler.options}</additionalCompilerOptions>
+          <targets>${royale.targets}</targets>
+          <allowSubclassOverrides>true</allowSubclassOverrides>
+          <skipAS>${royale.skipAS}</skipAS>
+          <skipExtern>true</skipExtern>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
+  <dependencies>
     <dependency>
       <groupId>org.apache.royale.typedefs</groupId>
       <artifactId>royale-typedefs-gcl</artifactId>
@@ -137,10 +150,10 @@
       <classifier>typedefs</classifier>
     </dependency>
     <!--
-     By declaring this dependency here, we force the royale-externs-js to be
-     added to the external library path of all modules. Without this it would
-     have gone to the library path.
-     -->
+      By declaring this dependency here, we force the royale-externs-js to be
+      added to the external library path of all modules. Without this it would
+      have gone to the library path.
+    -->
     <dependency>
       <groupId>org.apache.royale.typedefs</groupId>
       <artifactId>royale-typedefs-js</artifactId>
@@ -150,4 +163,5 @@
       <scope>runtime</scope>
     </dependency>
   </dependencies>
+
 </project>