[royale-compiler] branch develop updated: BaseMojo: fixed issue where forceSwcExternalLibraryPath was not used for js- and swf- library paths

[joshtynjala]

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new 23defb9  BaseMojo: fixed issue where forceSwcExternalLibraryPath was 
not used for js- and swf- library paths
23defb9 is described below

commit 23defb9a924c3b553cce1064302b8ab44070656d
Author: Josh Tynjala <joshtynj...@apache.org>
AuthorDate: Tue Jul 16 11:08:31 2019 -0700

    BaseMojo: fixed issue where forceSwcExternalLibraryPath was not used for 
js- and swf- library paths
---
 .../src/main/java/org/apache/royale/maven/BaseMojo.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java 
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
index ca1add1..c4c91c2 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
@@ -337,11 +337,17 @@ public abstract class BaseMojo
     }
 
     protected List<Artifact> getJSLibraries(List<Artifact> artifacts) {
-        return internalGetLibrariesJS(artifacts);
+        if(!isForceSwcExternalLibraryPath()) {
+            return internalGetLibrariesJS(artifacts);
+        }
+        return Collections.emptyList();
     }
     
     protected List<Artifact> getSWFLibraries(List<Artifact> artifacts) {
-        return internalGetLibrariesSWF(artifacts);
+        if(!isForceSwcExternalLibraryPath()) {
+            return internalGetLibrariesSWF(artifacts);
+        }
+        return Collections.emptyList();
     }
     
     protected List<Artifact> getThemeLibraries(List<Artifact> artifacts) {
@@ -380,6 +386,9 @@ public abstract class BaseMojo
                 }
             }
         }
+        if(isForceSwcExternalLibraryPath()) {
+            externalLibraries.addAll(internalGetLibrariesJS(artifacts));
+        }
         return externalLibraries;
     }
     
@@ -393,6 +402,9 @@ public abstract class BaseMojo
                 }
             }
         }
+        if(isForceSwcExternalLibraryPath()) {
+            externalLibraries.addAll(internalGetLibrariesSWF(artifacts));
+        }
         return externalLibraries;
     }