Skip to content
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

Add support for Java 9 multi release jars #61 #76

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for Java 9 multi release jars #61 #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10e1342
Add support for Java 9 multi release jars #61
liamsharp Dec 15, 2017
14a73cb
Merge branch 'master' into issue63_pullreq
lasselindqvist Jun 17, 2019
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
33 changes: 21 additions & 12 deletions src/main/java/com/github/wvengen/maven/proguard/ProGuardMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ public class ProGuardMojo extends AbstractMojo {
*/
private boolean putLibraryJarsInTempDir;

/**
* Sets an exclude for all library jars, eg: (!META-INF/versions/**)
*
* @parameter default-value=""
*/
private String libraryJarExclusion;

/**
* Specifies that project compile dependencies should be added as injar.
Expand Down Expand Up @@ -566,12 +572,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
args.add(fileToString(file));
} else {
log.debug("--- ADD libraryjars:" + artifact.getArtifactId());
if (putLibraryJarsInTempDir) {
libraryJars.add(file);
} else {
args.add("-libraryjars");
args.add(fileToString(file));
}
addLibraryJar(args, libraryJars, file);
}
}
}
Expand Down Expand Up @@ -601,12 +602,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {

if (libs != null) {
for (String lib : libs) {
if (putLibraryJarsInTempDir) {
libraryJars.add(new File(lib));
} else {
args.add("-libraryjars");
args.add(fileNameToString(lib));
}
addLibraryJar(args, libraryJars, new File(lib));
}
}

Expand Down Expand Up @@ -753,6 +749,19 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}
}

private void addLibraryJar(ArrayList<String> args, ArrayList<File> libraryJars, File file)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the method signature we could just use List instead of ArrayList

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private void addLibraryJar(ArrayList<String> args, ArrayList<File> libraryJars, File file)
private void addLibraryJar(List<String> args, List<File> libraryJars, File file)

{
if (putLibraryJarsInTempDir) {
libraryJars.add(file);
} else {
args.add("-libraryjars");
args.add(fileToString(file));
if (libraryJarExclusion != null) {
args.add(libraryJarExclusion);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understood correctly, this exclusion string should be added immediately after the filename without any spaces between them. This would seem to add it as a separate argument for the command.

}
}
}

private void attachTextFile(File theFile, String mainClassifier, String suffix) {
final String classifier = (null == mainClassifier ? "" : mainClassifier+"-") + suffix;
log.info("Attempting to attach "+suffix+" artifact");
Expand Down