[guice] 01/02: Fixed a build failure with Java 8 (Closes: #750750)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository guice.

commit ba8237a6560200cfcefe7c214665931825b1fe32
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Aug 8 18:20:48 2014 +0200

    Fixed a build failure with Java 8 (Closes: #750750)
---
 debian/changelog                           |  1 +
 debian/patches/04_java8-compatibility.diff | 18 ++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2682c55..37cd78d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 guice (3.0-4) UNRELEASED; urgency=low
 
   * Team upload.
+  * Fixed a build failure with Java 8 (Closes: #750750)
   * Use XZ compression for the upstream tarball
   * Exclude the IntelliJ project files from the upstream tarball
   * Use canonical URLs for the Vcs-* fields
diff --git a/debian/patches/04_java8-compatibility.diff b/debian/patches/04_java8-compatibility.diff
new file mode 100644
index 0000000..0124899
--- /dev/null
+++ b/debian/patches/04_java8-compatibility.diff
@@ -0,0 +1,18 @@
+Description: Java 8 is more restrictive about generic type inference in situations
+ involving raw types, which prevents guice from compiling. This change
+ allows guice to be compiled with javac 8.
+Origin: backport, https://github.com/google/guice/commit/3382133
+--- a/core/src/com/google/inject/spi/DefaultBindingTargetVisitor.java
++++ b/core/src/com/google/inject/spi/DefaultBindingTargetVisitor.java
+@@ -69,9 +69,9 @@
+     return visitOther(convertedConstantBinding);
+   }
+ 
+-   // javac says it's an error to cast ProviderBinding<? extends T> to Binding<? extends T>
+   @SuppressWarnings("unchecked")
+   public V visit(ProviderBinding<? extends T> providerBinding) {
+-    return visitOther((Binding) providerBinding);
++    // TODO(cushon): remove raw (Binding) cast when we don't care about javac 6 anymore
++    return visitOther((Binding<? extends T>) (Binding) providerBinding);
+   }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 4afc842..0789487 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_fix_build.diff
 02_link_javadocs.diff
 03_extensions-assistedinject.diff
+04_java8-compatibility.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git