This is an automated email from the git hooks/post-receive script. komal-guest pushed a commit to branch master in repository proguard.
commit 220b76f03c45a3144e1991fdb075c3fcf99920b2 Author: Komal Sukhani <[email protected]> Date: Mon Aug 31 17:57:18 2015 +0530 Add patch file to resolve conflict caused by openJDK8 --- .../patches/resolve_conflict_caused_by_openjdk8.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 20 insertions(+) diff --git a/debian/patches/resolve_conflict_caused_by_openjdk8.patch b/debian/patches/resolve_conflict_caused_by_openjdk8.patch new file mode 100644 index 0000000..8e02958 --- /dev/null +++ b/debian/patches/resolve_conflict_caused_by_openjdk8.patch @@ -0,0 +1,19 @@ +Description: Fully qualify Optional annotation + This patch resolves conflict caused by introduction of Optional class + in OpenJDK8. +Author: Komal Sukhani <[email protected]> +Forwarded: no +Last-Update: 2015-08-31 +Index: proguard/src/proguard/gradle/ProGuardTask.java +=================================================================== +--- proguard.orig/src/proguard/gradle/ProGuardTask.java ++++ proguard/src/proguard/gradle/ProGuardTask.java +@@ -68,7 +68,7 @@ public class ProGuardTask extends Defaul + return getProject().files(inJarFiles); + } + +- @Optional @OutputFiles ++ @org.gradle.api.tasks.Optional @OutputFiles + protected FileCollection getOutJarFileCollection() + { + return getProject().files(outJarFiles); diff --git a/debian/patches/series b/debian/patches/series index d5bc325..2637257 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ enable_building_of_gradle_task.patch correct_properties_file_path.patch add-bin.patch +resolve_conflict_caused_by_openjdk8.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/proguard.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
