commit 9600e97393ac4a8cc11b16e91396f81c6edb2c7c
author Paul Duffin <paulduffin@google.com> Fri Feb 24 13:38:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 24 13:38:23 2017 +0000
tree 19ecc8bbdcbc39352aa444d3643e84b09329d40e
parent 00bf3bd13a7e2a40b124db36ec3fd08fefaf8b92
parent ec7ba37c4102e583e5b50b737db8ceaa133ba25f

Merge changes from topic 'upgrade-hamcrest-to-2.0' am: a565149246 am: a4abf50c68
am: ec7ba37c41

Change-Id: Id050d56e8f8442f413f17bb89314ade516a800ac

src/main/java/org/junit/matchers/JUnitMatchers.java

diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java
index 13407cc..5bb48d7 100644
--- a/src/main/java/org/junit/matchers/JUnitMatchers.java
+++ b/src/main/java/org/junit/matchers/JUnitMatchers.java
@@ -48,7 +48,7 @@
      */
     @Deprecated
     public static <T> Matcher<Iterable<T>> hasItems(Matcher<? super T>... elementMatchers) {
-        return CoreMatchers.hasItems(elementMatchers);
+        return CoreMatchers.<T>hasItems(elementMatchers);
     }
 
     /**
@@ -57,7 +57,7 @@
      */
     @Deprecated
     public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) {
-        return CoreMatchers.everyItem(elementMatcher);
+        return CoreMatchers.everyItem((Matcher) elementMatcher);
     }
 
     /**