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.

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

also extract duplicates from output folder #705

Merged
merged 1 commit into from
Jan 27, 2016

Conversation

kedzie
Copy link
Contributor

@kedzie kedzie commented Dec 22, 2015

extract duplicates functionality only looked at dependent jars, not the project output folder.

@kedzie
Copy link
Contributor Author

kedzie commented Jan 13, 2016

This has 2 bugfixes related to extractDuplicates. @mosabua @psorobka

  1. Also include duplicates in output folder, not just 3rd party jars.
  2. Handle multiple 3rd party jars with same name, i.e. classes.jar, by appending an index to each jar in unpacked-embedded-jars folder.

@mosabua
Copy link
Member

mosabua commented Jan 13, 2016

I am working my way through the PRs to a release at the moment. Should have a release with this hopefully some time next week.. fyi @simpligility/android-maven-plugins-core-committers

@@ -21,6 +21,7 @@
import com.android.sdklib.build.DuplicateFileException;
import com.android.sdklib.build.SealedApkException;
import com.simpligility.maven.plugins.android.AbstractAndroidMojo;
import com.google.common.io.Files;
Copy link
Member

Choose a reason for hiding this comment

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

Why is this not using the normal commons-io but the google fork instead?

Copy link
Member

Choose a reason for hiding this comment

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

hm... sorry.. looks like its not a fork but a powerful replacement. I guess thats fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can change it. do you mean apache commons-io or is it also in the jdk?
On Jan 19, 2016 5:28 PM, "Manfred Moser" [email protected] wrote:

In
src/main/java/com/simpligility/maven/plugins/android/phase09package/ApkMojo.java
#705 (comment)
:

@@ -21,6 +21,7 @@
import com.android.sdklib.build.DuplicateFileException;
import com.android.sdklib.build.SealedApkException;
import com.simpligility.maven.plugins.android.AbstractAndroidMojo;
+import com.google.common.io.Files;

Why is this not using the normal commons-io but the google fork instead?


Reply to this email directly or view it on GitHub
https://github.com/simpligility/android-maven-plugin/pull/705/files#r50193127
.

Copy link
Member

Choose a reason for hiding this comment

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

I meant apache commons since I think its already used in the project... just to reduce different tools used. But have a look first .. if its too much effort .. using the google one is fine as well. Btw... is it part of guava?

-also extract duplicates from output folder, not just 3rd party deps
-Handle multiple 3rd party deps with the same basename, i.e. classes.jar.
@mosabua
Copy link
Member

mosabua commented Jan 27, 2016

Merged and tested locally. Everything works.

mosabua added a commit that referenced this pull request Jan 27, 2016
also extract duplicates from output folder
@mosabua mosabua merged commit 9f2726d into simpligility:master Jan 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants