royale-maven-plugin: fixed issue where includeLibrary() included all libraries for both JS and SWF
Depending on the ordering of the libraries, this could cause the build to fail for the same set of libraries. Now, it differentiates between JS and SWF based on the Type enum
diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASDocMojo.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASDocMojo.java
index b9424b9..297cd05 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASDocMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASDocMojo.java
@@ -20,6 +20,7 @@
package org.apache.royale.maven;
import org.apache.flex.tools.FlexTool;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -159,6 +160,23 @@
return defines;
}
+ @Override
+ protected boolean includeLibrary(Artifact library) {
+ switch (type.get()) {
+ case SWF: {
+ String classifier = library.getClassifier();
+ return "swf".equalsIgnoreCase(classifier) ||
+ ((classifier == null) && "runtime".equalsIgnoreCase(library.getScope()));
+ }
+ case JS: {
+ String classifier = library.getClassifier();
+ return "typedefs".equalsIgnoreCase(classifier) ||
+ "js".equalsIgnoreCase(classifier);
+ }
+ }
+ return false;
+ }
+
private enum Type {
SWF,
JS
