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

Proguard7 fix #111

Merged
merged 4 commits into from
Aug 5, 2020
Merged

Proguard7 fix #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc185a8
First try on proguard 7.0 suppor
MarcMil Jul 8, 2020
18e31f7
Use <= for comparison, since -core and -base should beo n the same level
MarcMil Jul 8, 2020
c77ebf0
Finally get it working with v. 7
MarcMil Jul 8, 2020
89773ba
Update dependent version to proguard 7
MarcMil Jul 13, 2020
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
17 changes: 14 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,23 @@
</contributor>
</contributors>

<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-guardsquare-proguard</id>
<name>bintray</name>
<url>https://dl.bintray.com/guardsquare/proguard</url>
</repository>
</repositories>

<dependencies>

<dependency>
<groupId>net.sf.proguard</groupId>
<groupId>com.guardsquare</groupId>
<artifactId>proguard-base</artifactId>
<version>6.1.1</version>
<version>7.0.0</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -137,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.2</version>
<version>3.6.0</version>
</plugin>

<plugin>
Expand Down
89 changes: 51 additions & 38 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 @@ -26,16 +26,18 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;

import org.apache.commons.io.IOUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
Expand Down Expand Up @@ -130,7 +132,6 @@ public class ProGuardMojo extends AbstractMojo {
*/
private boolean putLibraryJarsInTempDir;


/**
* Specifies that project compile dependencies should be added as injar.
*
Expand Down Expand Up @@ -298,7 +299,6 @@ public class ProGuardMojo extends AbstractMojo {
*/
private JarArchiver jarArchiver;


/**
* The maven archive configuration to use. only if assembly is used.
*
Expand Down Expand Up @@ -395,6 +395,7 @@ private boolean useArtifactClassifier() {
return appendClassifier && ((attachArtifactClassifier != null) && (attachArtifactClassifier.length() > 0));
}

@Override
public void execute() throws MojoExecutionException, MojoFailureException {

log = getLog();
Expand Down Expand Up @@ -564,7 +565,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
args.add(filter.toString());
}


if (includeDependency) {
@SuppressWarnings("unchecked")
List<Artifact> dependency = this.mavenProject.getCompileArtifacts();
Expand Down Expand Up @@ -633,15 +633,16 @@ public void execute() throws MojoExecutionException, MojoFailureException {
log.debug("Copy libraryJars to temporary directory");
log.debug("Temporary directory: " + tempLibraryjarsDir);
if (tempLibraryjarsDir.exists()) {
try{
FileUtils.deleteDirectory(tempLibraryjarsDir);
} catch(IOException ignored){
throw new MojoFailureException("Deleting failed libraryJars directory", ignored);
}
try {
FileUtils.deleteDirectory(tempLibraryjarsDir);
} catch (IOException ignored) {
throw new MojoFailureException("Deleting failed libraryJars directory", ignored);
}
}
tempLibraryjarsDir.mkdir();
if (!tempLibraryjarsDir.exists()) {
throw new MojoFailureException("Can't create temporary libraryJars directory: " + tempLibraryjarsDir.getAbsolutePath());
throw new MojoFailureException(
"Can't create temporary libraryJars directory: " + tempLibraryjarsDir.getAbsolutePath());
}
// Use this subdirectory for all libraries that are files, and not directories themselves
File commonDir = new File(tempLibraryjarsDir, "0");
Expand Down Expand Up @@ -673,7 +674,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
args.add(fileToString(mappingFile.getAbsoluteFile()));

args.add("-printseeds");
args.add(fileToString((new File(outputDirectory,seedFileName).getAbsoluteFile())));
args.add(fileToString((new File(outputDirectory, seedFileName).getAbsoluteFile())));

if (incremental && applyMappingFile == null) {
throw new MojoFailureException("applyMappingFile is required if incremental is true");
Expand All @@ -693,8 +694,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}

log.info("execute ProGuard " + args.toString());
proguardMain(getProguardJar(this), args, this);

proguardMain(getProguardJars(this), args, this);

if (!libraryJars.isEmpty()) {
deleteFileOrDirectory(tempLibraryjarsDir);
Expand Down Expand Up @@ -787,26 +787,26 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}

private void attachTextFile(File theFile, String mainClassifier, String suffix) {
final String classifier = (null == mainClassifier ? "" : mainClassifier+"-") + suffix;
log.info("Attempting to attach "+suffix+" artifact");
final String classifier = (null == mainClassifier ? "" : mainClassifier + "-") + suffix;
log.info("Attempting to attach " + suffix + " artifact");
if (theFile.exists()) {
if (theFile.isFile()) {
projectHelper.attachArtifact(mavenProject, "txt", classifier, theFile);
} else {
log.warn("Cannot attach file because it is not a file: "+theFile);
log.warn("Cannot attach file because it is not a file: " + theFile);
}
} else {
log.warn("Cannot attach file because it does not exist: "+theFile);
log.warn("Cannot attach file because it does not exist: " + theFile);

}
}

private File getProguardJar(ProGuardMojo mojo) throws MojoExecutionException {
private List<File> getProguardJars(ProGuardMojo mojo) throws MojoExecutionException {

if (proguardJar != null) {
if (proguardJar.exists()) {
if (proguardJar.isFile()) {
return proguardJar;
return Collections.singletonList(proguardJar);
} else {
mojo.getLog().warn("proguard jar (" + proguardJar + ") is not a file");
throw new MojoExecutionException("proguard jar (" + proguardJar + ") is not a file");
Expand All @@ -817,42 +817,53 @@ private File getProguardJar(ProGuardMojo mojo) throws MojoExecutionException {
}
}

Artifact proguardArtifact = null;
List<Artifact> proguardArtifacts = new ArrayList<Artifact>();
int proguardArtifactDistance = -1;
// This should be solved in Maven 2.1
//Starting in v. 7.0.0., proguard got split up in proguard-base and proguard-core,
//both of which need to be on the classpath.
for (Artifact artifact : mojo.pluginArtifacts) {
mojo.getLog().debug("pluginArtifact: " + artifact.getFile());
final String artifactId = artifact.getArtifactId();
if (artifactId.startsWith((useDexGuard?"dexguard":"proguard")) &&
!artifactId.startsWith("proguard-maven-plugin")) {
if (artifactId.startsWith((useDexGuard ? "dexguard" : "proguard"))
&& !artifactId.startsWith("proguard-maven-plugin")) {
int distance = artifact.getDependencyTrail().size();
mojo.getLog().debug("proguard DependencyTrail: " + distance);
if ((mojo.proguardVersion != null) && (mojo.proguardVersion.equals(artifact.getVersion()))) {
proguardArtifact = artifact;
break;
proguardArtifacts.add(artifact);
} else if (proguardArtifactDistance == -1) {
proguardArtifact = artifact;
proguardArtifacts.add(artifact);
proguardArtifactDistance = distance;
} else if (distance < proguardArtifactDistance) {
proguardArtifact = artifact;
} else if (distance <= proguardArtifactDistance) {
Iterator<Artifact> it = proguardArtifacts.iterator();
while (it.hasNext()) {
Artifact art = it.next();
if (distance < art.getDependencyTrail().size())
it.remove();
}
proguardArtifacts.add(artifact);
proguardArtifactDistance = distance;
}
}
}
if (proguardArtifact != null) {
mojo.getLog().debug("proguardArtifact: " + proguardArtifact.getFile());
return proguardArtifact.getFile().getAbsoluteFile();
if (!proguardArtifacts.isEmpty()) {
List<File> resList = new ArrayList<File>(proguardArtifacts.size());
for (Artifact p : proguardArtifacts) {
mojo.getLog().debug("proguardArtifact: " + p.getFile());
resList.add(p.getFile().getAbsoluteFile());
}
return resList;
}
mojo.getLog().info((useDexGuard?"dexguard":"proguard") + " jar not found in pluginArtifacts");
mojo.getLog().info((useDexGuard ? "dexguard" : "proguard") + " jar not found in pluginArtifacts");

ClassLoader cl;
cl = mojo.getClass().getClassLoader();
// cl = Thread.currentThread().getContextClassLoader();
String classResource = "/" + mojo.proguardMainClass.replace('.', '/') + ".class";
URL url = cl.getResource(classResource);
if (url == null) {
throw new MojoExecutionException("Obfuscation failed ProGuard (" + mojo.proguardMainClass
+ ") not found in classpath");
throw new MojoExecutionException(
"Obfuscation failed ProGuard (" + mojo.proguardMainClass + ") not found in classpath");
}
String proguardJar = url.toExternalForm();
if (proguardJar.startsWith("jar:file:")) {
Expand All @@ -861,10 +872,10 @@ private File getProguardJar(ProGuardMojo mojo) throws MojoExecutionException {
} else {
throw new MojoExecutionException("Unrecognized location (" + proguardJar + ") in classpath");
}
return new File(proguardJar);
return Collections.singletonList(new File(proguardJar));
}

private void proguardMain(File proguardJar, List<String> argsList, ProGuardMojo mojo)
private void proguardMain(Collection<File> proguardJars, List<String> argsList, ProGuardMojo mojo)
throws MojoExecutionException {

Java java = new Java();
Expand All @@ -885,9 +896,10 @@ private void proguardMain(File proguardJar, List<String> argsList, ProGuardMojo
java.setProject(antProject);
java.setTaskName("proguard");

mojo.getLog().info("proguard jar: " + proguardJar);
mojo.getLog().info("proguard jar: " + proguardJars);

java.createClasspath().setLocation(proguardJar);
for (File p : proguardJars)
java.createClasspath().createPathElement().setLocation(p);
// java.createClasspath().setPath(System.getProperty("java.class.path"));
java.setClassname(mojo.proguardMainClass);

Expand Down Expand Up @@ -940,7 +952,8 @@ private boolean deleteFileOrDirectory(File path) throws MojoFailureException {
}
}

private Set<Artifact> getDependencies(final Inclusion inc, MavenProject mavenProject) throws MojoExecutionException {
private Set<Artifact> getDependencies(final Inclusion inc, MavenProject mavenProject)
throws MojoExecutionException {
@SuppressWarnings("unchecked")
Set<Artifact> dependencies = mavenProject.getArtifacts();
Set<Artifact> result = new HashSet<Artifact>();
Expand Down