Merge pull request #56 from csmith/master

Update dependencies.

build.gradle

@@ -25,11 +25,11 @@ repositories.mavenCentral()
 
 dependencies {
     compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
-    compile group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
+    compile group: 'com.google.auto.value', name: 'auto-value', version: '1.3'
     compile group: 'com.google.guava', name:'guava', version: '19.0'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.2.7'
     testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.1'
 }
 

src/test/java/com/dmdirc/util/io/DownloaderTest.java

@@ -46,6 +46,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyFloat;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.atLeastOnce;
@@ -70,7 +71,6 @@ public class DownloaderTest {
                 "OMG IM A FAKE DOWNLOAD".getBytes("UTF-8"));
         when(mockedConnection.getInputStream()).thenReturn(is);
         when(mockedConnection.getOutputStream()).thenReturn(os);
-        when(mockedConnection.getLastModified()).thenReturn(10L, (Long)11L);
     }
 
     @Test
@@ -137,7 +137,7 @@ public class DownloaderTest {
         assertEquals(Lists.newArrayList("OMG IM A FAKE DOWNLOAD"), Files.readAllLines(file,
                 Charset.forName("UTF-8")));
         verify(listener).setIndeterminate(anyBoolean());
-        verify(listener, atLeastOnce()).downloadProgress(anyInt());
+        verify(listener, atLeastOnce()).downloadProgress(anyFloat());
     }
 
     private class TestableDownloader extends Downloader {