8000 Some minor updates by magnayn · Pull Request #8 · chrisdutz/flexmojos · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Some minor updates #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: flexmojos-7.x
Choose a base branch
from
Open

Some minor updates #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions flexmojos-maven-plugin/src/main/java/net/flexmojos/oss/plugin/AbstractMavenMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,10 @@ public String getFrameworkGroupId()
if(frameworkArtifact != null) {
return frameworkArtifact.getGroupId() + ".framework";
}
return null;

// This is a sensible default, and is what is always returned currently
// from getFrameworkArtifact anyway.
return "org.apache.flex.framework";
}

public String getCompilerVersion()
Expand All @@ -501,7 +504,10 @@ public String getFrameworkArtifactVersion(String groupId, String artifactId)
if(frameworkArtifact != null) {
return frameworkArtifact.getVersion();
}
return null;

// Missing. Try framework version

return getFrameworkVersion();
}

public Set<Artifact> getDependencies()
Expand Down
3 changes: 2 additions & 1 deletion ...aven-plugin/src/main/java/net/flexmojos/oss/plugin/compiler/AbstractFlexCompilerMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2498,7 +2498,8 @@ public INamespace[] getNamespace()

if ( dir == null )
{
return this.namespaces;
getLog().error("Could not find framework. Namespaces not included in configuration; errors in the build may occur.");
return namespaces.toArray( new INamespace[namespaces.size()] );
}

Reader cfg = null;
Expand Down
0