Build against hamcrest 2.0.0.0

 - fix compile errors due to looser generic bounds
 - remove @factory annotations
 - make Gradle file take hamcrest and junit versions from environment variables, for use in matrix CI builds

build.gradle

@@ -6,15 +6,18 @@ archivesBaseName = "hamcrest-junit"
 group = "org.hamcrest"
 version = hasProperty("-version") ? property("-version") : "SNAPSHOT"
 
+def junit = System.getenv("junit") ?: 'junit:junit:4.12'
+def hamcrest = System.getenv("hamcrest") ?: 'org.hamcrest:java-hamcrest:2.0.0.0'
+
 sourceCompatibility = "1.7"
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compile group: 'junit', name: 'junit', version: '4.12', transitive: false
-    compile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3', transitive: false
+    compile (junit)    { transitive = false }
+    compile (hamcrest) { transitive = false }
 }
 
 test {

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

@@ -56,7 +56,7 @@ public static <T> Matcher<Iterable<T>> hasItems(Matcher<? super T>... elementMat
      * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead.
      */
     @Deprecated
-    public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) {
+    public static <T> Matcher<Iterable<? extends T>> everyItem(final Matcher<T> elementMatcher) {
         return CoreMatchers.everyItem(elementMatcher);
     }
 

src/main/java/org/hamcrest/junit/internal/StacktracePrintingMatcher.java

@@ -4,7 +4,6 @@
 import java.io.StringWriter;
 
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 
 /**
@@ -42,13 +41,11 @@ private String readStacktrace(Throwable throwable) {
         return stringWriter.toString();
     }
 
-    @Factory
     public static <T extends Throwable> Matcher<T> isThrowable(
             Matcher<T> throwableMatcher) {
         return new StacktracePrintingMatcher<T>(throwableMatcher);
     }
 
-    @Factory
     public static <T extends Exception> Matcher<T> isException(
             Matcher<T> exceptionMatcher) {
         return new StacktracePrintingMatcher<T>(exceptionMatcher);