Skip to content

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

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

Closed
liamsharp wants to merge 1 commit into from
Closed

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

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
44 changes: 24 additions & 20 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 @@ -60,7 +60,7 @@

public class ProGuardMojo extends AbstractMojo {

/**
/**
Copy link
Owner

@wvengen wvengen May 29, 2018

Choose a reason for hiding this comment

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

one more space?

* Set this to 'true' to bypass ProGuard processing entirely.
*
* @parameter property="proguard.skip"
Expand Down Expand Up @@ -123,7 +123,13 @@ public class ProGuardMojo extends AbstractMojo {
* @parameter default-value="false"
*/
private boolean putLibraryJarsInTempDir;


/**
Copy link
Owner

@wvengen wvengen May 29, 2018

Choose a reason for hiding this comment

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

oops, also indentation mismatch

* 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 @@ -475,12 +481,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
// This may not be CompileArtifacts, maven 2.0.6 bug
File file = getClasspathElement(getDependency(inc, mavenProject), mavenProject);
inPath.add(file.toString());
if(putLibraryJarsInTempDir){
libraryJars.add(file);
} else {
args.add("-libraryjars");
args.add(fileToString(file));
}
addLibraryJar(args, libraryJars, file);
}
}
}
Expand Down Expand Up @@ -530,12 +531,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 @@ -565,12 +561,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 @@ -691,6 +682,19 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}
}

private void addLibraryJar(ArrayList<String> args, ArrayList<File> libraryJars, File file)
{
if (putLibraryJarsInTempDir) {
libraryJars.add(file);
} else {
args.add("-libraryjars");
args.add(fileToString(file));
Copy link
Owner

@wvengen wvengen May 29, 2018

Choose a reason for hiding this comment

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

This still looks like an indentation mismatch, right?

if (libraryJarExclusion != null) {
args.add(libraryJarExclusion);
}
}
}

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