commit ccc794a961024ef46abb10820dd7df0df576e552
author Paul Duffin <paulduffin@google.com> Mon Jan 23 14:41:16 2017 +0000
committer Paul Duffin <paulduffin@google.com> Wed Jan 25 14:12:53 2017 +0000
tree c943ef6426c373006eda0dfd137bed3dcb7e7d30
parent facdecc8e055d722b8c0e0c8fbf8a8644e7fec57

Allow JUnit to compile against external/hamcrest v2.0

Bug: 30946317
Test: make checkbuild
Change-Id: Idbeddca3346d43ed39cdbb0c6e44779b54f981a4

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);
     }
 
     /**