Merge pull request #139 from csmith/master

Update dependencies.

build.gradle

@@ -96,19 +96,19 @@ subprojects {
     dependencies {
         compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
         compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.5'
-        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: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
         compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.5'
         compile group: 'com.google.guava', name:'guava', version: '19.0'
 
-        compile group: 'net.engio', name: 'mbassador', version: '1.2.4.2'
+        compile group: 'net.engio', name: 'mbassador', version: '1.3.0'
         compile group: 'de.odysseus.juel', name: 'juel-api', version: '2.2.7'
         compile group: 'de.odysseus.juel', name: 'juel-impl', version: '2.2.7'
         compile group: 'de.odysseus.juel', name: 'juel-spi', version: '2.2.7'
 
         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'
     }
 
     task publishSnapshot(dependsOn: 'publishMavenJavaPublicationToSnapshotsRepository') << {

irc/src/test/java/com/dmdirc/parser/irc/IRCReaderTest.java

@@ -71,8 +71,8 @@ public class IRCReaderTest {
         final InputStream stream = new ByteArrayInputStream("te t :foo\r\n".getBytes());
         final Encoder encoder = mock(Encoder.class);
 
-        when(encoder.encode((String) isNull(), (String) isNull(),
-                (byte[]) anyObject(), anyInt(), eq(3)))
+        when(encoder.encode(isNull(), isNull(),
+                anyObject(), anyInt(), eq(3)))
                 .thenReturn("encoded");
 
         final IRCReader reader = new IRCReader(stream, encoder);
@@ -88,9 +88,7 @@ public class IRCReaderTest {
         final InputStream stream = new ByteArrayInputStream("foo bar  baz  :qux  baz\r\n".getBytes());
         final Encoder encoder = mock(Encoder.class);
 
-        when(encoder.encode((String) isNull(), (String) isNull(),
-                (byte[]) anyObject(), eq(15), eq(8)))
-                .thenReturn("qux  baz");
+        when(encoder.encode(isNull(), isNull(), any(), eq(15), eq(8))).thenReturn("qux  baz");
 
         final IRCReader reader = new IRCReader(stream, encoder);
         final ReadLine line = reader.readLine();
@@ -106,8 +104,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(eq("src"), anyString(),
-                (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(eq("src"), isNull(), any(), anyInt(), anyInt());
     }
 
     /** Verifies that no source is passed if the source is empty. */
@@ -118,8 +115,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode((String) isNull(), anyString(),
-                (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(isNull(), isNull(), any(), anyInt(), anyInt());
     }
 
     /** Verifies that a destination is extracted properly. */
@@ -130,8 +126,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(anyString(), eq("y"), (byte[]) anyObject(),
-                anyInt(), anyInt());
+        verify(encoder).encode(anyString(), eq("y"), any(), anyInt(), anyInt());
     }
 
     /** Verifies that no destination is extracted if there's no source. */
@@ -142,8 +137,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(anyString(), (String) isNull(),
-                (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(isNull(), isNull(), any(), anyInt(), anyInt());
     }
 
     /** Verifies that no destination is extracted if there are too few args. */
@@ -154,8 +148,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(anyString(), (String) isNull(),
-                (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(anyString(), isNull(), any(), anyInt(), anyInt());
     }
 
     /** Verifies that a numeric's destination is extracted properly. */
@@ -166,7 +159,7 @@ public class IRCReaderTest {
 
         new IRCReader(stream, encoder).readLine();
 
-        verify(encoder).encode(anyString(), eq("y"), (byte[]) anyObject(), anyInt(), anyInt());
+        verify(encoder).encode(anyString(), eq("y"), any(), anyInt(), anyInt());
     }
 
     /** Verifies that the close call is proxied to the stream. */
@@ -190,8 +183,7 @@ public class IRCReaderTest {
                 (int) '1', (int) ' ', 0xF6, (int) ' ', (int) 'y', (int) ' ', (int) 'z', (int) ' ',
                 (int) ':', (int) 'x', (int) '\r', (int) '\n');
 
-        when(encoder.encode(anyString(), anyString(),
-                (byte[]) any(), anyInt(), anyInt())).thenReturn("x");
+        when(encoder.encode(anyString(), anyString(), any(), anyInt(), anyInt())).thenReturn("x");
 
         final ReadLine line = new IRCReader(stream, encoder, Charset.forName("UTF-8")).readLine();
 

irc/src/test/java/com/dmdirc/parser/irc/processors/Process001Test.java

@@ -129,7 +129,7 @@ public class Process001Test {
         when(localClient.getNickname()).thenAnswer(invocation -> nickname.toString());
         doAnswer(invocation -> {
             nickname.setLength(0);
-            nickname.append(invocation.getArgumentAt(0, String.class));
+            nickname.append(invocation.<String>getArgument(0));
             return null;
         }).when(localClient).setUserBits(anyString(), eq(true), anyBoolean());
     }