This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit 0309348c5c1a83a39e1a7017be02eea0f5cea57b Author: Emmanuel Bourg <[email protected]> Date: Mon May 12 10:00:51 2014 +0200 Fixed a compilation error with Java 8 --- debian/changelog | 1 + debian/patches/36_java8_compatibility.diff | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) diff --git a/debian/changelog b/debian/changelog index fc188d5..944c752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ gradle (1.5-1) UNRELEASED; urgency=low * New upstream release - Added a build dependency on libjatl-java - Refreshed the patches + * Fixed a compilation error with Java 8 * Updated the version of Guava used to fix a clean error * Use XZ compression for the upstream tarball diff --git a/debian/patches/36_java8_compatibility.diff b/debian/patches/36_java8_compatibility.diff new file mode 100644 index 0000000..06e0da7 --- /dev/null +++ b/debian/patches/36_java8_compatibility.diff @@ -0,0 +1,24 @@ +Description: Fixes the compilation errors with Java 8 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java ++++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java +@@ -254,7 +254,7 @@ + return; + } + +- Annotation optional = annotationTarget.getAnnotation(Optional.class); ++ Annotation optional = annotationTarget.getAnnotation(org.gradle.api.tasks.Optional.class); + if (optional == null) { + propertyInfo.setNotNullValidator(notNullValidator); + } +--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java ++++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java +@@ -22,6 +22,7 @@ + import org.gradle.api.internal.project.IsolatedAntBuilder; + import org.gradle.api.logging.LogLevel; + import org.gradle.api.tasks.*; ++import org.gradle.api.tasks.Optional; + + import java.io.File; + import java.io.Serializable; diff --git a/debian/patches/series b/debian/patches/series index b463bc9..b73c6de 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,4 @@ 33_scala_zinc.diff 34_disable_code_quality.diff 35_ivy_23.diff +36_java8_compatibility.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
