Unverified Commit adb7eae3 authored by Vitalii Koshura's avatar Vitalii Koshura Committed by GitHub

Merge pull request #4005 from Isira-Seneviratne/Update_dependencies

[Android] Update dependencies.
parents 08b9be3c f55820b3
......@@ -121,7 +121,7 @@ android {
}
}
ext {
coroutines_version = '1.3.7'
coroutines_version = '1.3.8'
dagger_version = '2.28.1'
lifecycle_version = '2.2.0'
powermock_version = '2.0.5'
......@@ -132,7 +132,7 @@ dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core-ktx:1.3.1'
implementation 'androidx.fragment:fragment-ktx:1.2.5'
implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"
......@@ -141,10 +141,10 @@ dependencies {
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'com.squareup.okio:okio:2.7.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'com.squareup.okio:okio:2.8.0'
implementation 'commons-io:commons-io:2.7'
implementation 'org.apache.commons:commons-lang3:3.10'
implementation 'org.apache.commons:commons-lang3:3.11'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
// Coroutine dependencies
......@@ -157,7 +157,7 @@ dependencies {
annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
testImplementation 'androidx.test:core:1.2.0'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'com.google.guava:guava-testlib:28.2-jre'
testImplementation 'junit:junit:4.13'
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
......
......@@ -73,13 +73,13 @@ class MonitorTest {
Mockito.verify(clientInterface).transferOperation(eq(emptyList<Transfer>()), eq(1))
}
@Test(expected = IllegalArgumentException::class)
fun `Expect IllegalArgumentException to be thrown when mBinder's setGlobalPreferences() is called with a null parameter`() {
@Test(expected = NullPointerException::class)
fun `Expect NullPointerException to be thrown when mBinder's setGlobalPreferences() is called with a null parameter`() {
monitor.mBinder.setGlobalPreferences(null)
}
@Test(expected = IllegalArgumentException::class)
fun `Expect IllegalArgumentException to be thrown when mBinder's readAuthToken() is called with a null parameter`() {
@Test(expected = NullPointerException::class)
fun `Expect NullPointerException to be thrown when mBinder's readAuthToken() is called with a null parameter`() {
monitor.mBinder.readAuthToken(null)
}
......
......@@ -81,8 +81,8 @@ public class AccountManagerParserTest {
}
@Test
public void testParser_whenLocalNameIsNull_thenExpectIllegalArgumentExceptionAndEmptyList() {
assertThrows(IllegalArgumentException.class, () ->
public void testParser_whenLocalNameIsNull_thenExpectNullPointerExceptionAndEmptyList() {
assertThrows(NullPointerException.class, () ->
accountManagerParser.startElement(null, null, null, null));
assertTrue(accountManagers.isEmpty());
......
......@@ -51,10 +51,10 @@ public class AccountOutParserTest {
}
@Test
public void testParse_whenRpcStringIsNull_thenExpectIllegalArgumentException() {
public void testParse_whenRpcStringIsNull_thenExpectNullPointerException() {
mockStatic(Xml.class);
assertThrows(IllegalArgumentException.class, () -> AccountOutParser.parse(null));
assertThrows(NullPointerException.class, () -> AccountOutParser.parse(null));
}
@Test(expected = UninitializedPropertyAccessException.class)
......@@ -73,8 +73,8 @@ public class AccountOutParserTest {
assertNull(AccountOutParser.parse(""));
}
@Test(expected = IllegalArgumentException.class)
public void testParser_whenLocalNameIsNull_thenExpectIllegalArgumentException()
@Test(expected = NullPointerException.class)
public void testParser_whenLocalNameIsNull_thenExpectNullPointerException()
throws SAXException {
accountOutParser.startElement(null, null, null, null);
}
......
......@@ -32,7 +32,10 @@ import org.xml.sax.SAXException;
import edu.berkeley.boinc.utils.Logging;
import kotlin.UninitializedPropertyAccessException;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.powermock.api.mockito.PowerMockito.doThrow;
......@@ -52,8 +55,8 @@ public class AcctMgrRPCReplyParserTest {
expected = new AcctMgrRPCReply();
}
@Test(expected = IllegalArgumentException.class)
public void testParse_whenRpcStringIsNull_thenExpectIllegalArgumentException() {
@Test(expected = NullPointerException.class)
public void testParse_whenRpcStringIsNull_thenExpectNullPointerException() {
mockStatic(Xml.class);
AcctMgrRPCReplyParser.parse(null);
......
......@@ -92,8 +92,8 @@ public class HostInfoParserTest {
assertNull(HostInfoParser.parse(""));
}
@Test(expected = IllegalArgumentException.class)
public void testParser_whenLocalNameIsNull_thenExpectIllegalArgumentException() throws SAXException {
@Test(expected = NullPointerException.class)
public void testParser_whenLocalNameIsNull_thenExpectNullPointerException() throws SAXException {
hostInfoParser.startElement(null, null, null, null);
}
......
......@@ -51,8 +51,8 @@ public class MessagesParserTest {
expected = new Message();
}
@Test(expected = IllegalArgumentException.class)
public void testParse_whenRpcResultIsNull_thenExpectIllegalArgumentException() {
@Test(expected = NullPointerException.class)
public void testParse_whenRpcResultIsNull_thenExpectNullPointerException() {
mockStatic(Xml.class);
MessagesParser.parse(null);
......
......@@ -51,7 +51,7 @@ public class NoticesParserTest {
expected = new Notice();
}
@Test(expected = IllegalArgumentException.class)
@Test(expected = NullPointerException.class)
public void testParse_whenRpcStringIsNull_thenExpectNullPointerException() {
mockStatic(Xml.class);
......
......@@ -30,7 +30,10 @@ import org.xml.sax.SAXException;
import kotlin.UninitializedPropertyAccessException;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.powermock.api.mockito.PowerMockito.doThrow;
......@@ -48,8 +51,8 @@ public class ProjectConfigReplyParserTest {
expected = new ProjectConfig();
}
@Test(expected = IllegalArgumentException.class)
public void testParse_whenRpcStringIsNull_thenExpectIllegalArgumentException() {
@Test(expected = NullPointerException.class)
public void testParse_whenRpcStringIsNull_thenExpectNullPointerException() {
mockStatic(Xml.class);
ProjectConfigReplyParser.parse(null);
......
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.4.0'
repositories {
jcenter()
maven {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment