diff --git a/build.gradle b/build.gradle index c78e1b983..29c530572 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = "1.5.31" + ext.kotlin_version = "1.6.20" ext.jacocoVersion = '0.8.7' repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.0.3" + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jacoco:org.jacoco.core:$jacocoVersion" classpath "com.dicedmelon.gradle:jacoco-android:0.1.5" @@ -66,7 +66,8 @@ ext { minSdkVersion = 21 targetSdkVersion = 31 - mockitoCoreVersion = "3.12.4" + mockitoCoreVersion = '4.6.1' junitVersion = "4.13.2" + jupiterVersion = "5.6.0" robolectricVersion = "4.7" } diff --git a/coroutines/build.gradle b/coroutines/build.gradle index 79e9b12b1..bf4bce59c 100644 --- a/coroutines/build.gradle +++ b/coroutines/build.gradle @@ -40,7 +40,7 @@ android { } ext { - coroutinesVersion = "1.5.2" + coroutinesVersion = "1.6.1" } dependencies { diff --git a/facebook/build.gradle b/facebook/build.gradle index 0fb8594da..3278b602f 100644 --- a/facebook/build.gradle +++ b/facebook/build.gradle @@ -35,7 +35,7 @@ android { } dependencies { - api "com.facebook.android:facebook-login:12.1.0" + api "com.facebook.android:facebook-login:[13.2.0, 14.0[" implementation project(":parse") testImplementation "junit:junit:$rootProject.ext.junitVersion" diff --git a/facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java b/facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java index df7f9d14a..57578c282 100644 --- a/facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java +++ b/facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java @@ -10,8 +10,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java b/facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java index 9d89b66cd..425df8798 100644 --- a/facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java +++ b/facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java @@ -11,13 +11,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/fcm/build.gradle b/fcm/build.gradle index 41c23d2a4..ce1c75d28 100644 --- a/fcm/build.gradle +++ b/fcm/build.gradle @@ -36,7 +36,7 @@ android { } dependencies { - api "com.google.firebase:firebase-messaging:23.0.0" + api 'com.google.firebase:firebase-messaging:23.0.3' implementation project(":parse") } diff --git a/google/build.gradle b/google/build.gradle index 7d2cddd4f..70f0a2237 100644 --- a/google/build.gradle +++ b/google/build.gradle @@ -41,9 +41,9 @@ android { dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - api "com.google.android.gms:play-services-auth:19.2.0" - api "androidx.activity:activity-ktx:1.3.1" - api "androidx.fragment:fragment-ktx:1.3.1" + api "com.google.android.gms:play-services-auth:20.1.0" + api "androidx.activity:activity-ktx:1.4.0" + api "androidx.fragment:fragment-ktx:1.4.1" implementation project(":parse") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00aeb6981..f2026a82a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Nov 16 15:15:09 EET 2021 +#Sat Apr 16 09:27:50 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/parse/build.gradle b/parse/build.gradle index ce5602919..99ffa2892 100644 --- a/parse/build.gradle +++ b/parse/build.gradle @@ -47,10 +47,11 @@ ext { dependencies { api "androidx.annotation:annotation:1.3.0" - api "androidx.core:core:1.7.0" + api "androidx.core:core:1.8.0" api "com.squareup.okhttp3:okhttp:$okhttpVersion" api project(':bolts-tasks') + testImplementation "org.junit.jupiter:junit-jupiter:$rootProject.ext.jupiterVersion" testImplementation "org.skyscreamer:jsonassert:1.5.0" testImplementation "junit:junit:$rootProject.ext.junitVersion" testImplementation "org.mockito:mockito-core:$rootProject.ext.mockitoCoreVersion" @@ -88,6 +89,10 @@ tasks.withType(Test) { } } +tasks.withType(Test) { + useJUnitPlatform() +} + jacocoAndroidUnitTestReport { csv.enabled false html.enabled true diff --git a/parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java b/parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java index c28265741..057784344 100644 --- a/parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java +++ b/parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/EventuallyPinTest.java b/parse/src/test/java/com/parse/EventuallyPinTest.java index e113f79a1..39ca2ab98 100644 --- a/parse/src/test/java/com/parse/EventuallyPinTest.java +++ b/parse/src/test/java/com/parse/EventuallyPinTest.java @@ -1,8 +1,8 @@ package com.parse; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/parse/src/test/java/com/parse/FileObjectStoreTest.java b/parse/src/test/java/com/parse/FileObjectStoreTest.java index dec5cd146..2fe2ce730 100644 --- a/parse/src/test/java/com/parse/FileObjectStoreTest.java +++ b/parse/src/test/java/com/parse/FileObjectStoreTest.java @@ -11,9 +11,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.skyscreamer.jsonassert.JSONAssert.assertEquals; diff --git a/parse/src/test/java/com/parse/NetworkObjectControllerTest.java b/parse/src/test/java/com/parse/NetworkObjectControllerTest.java index a3f22e565..985c7ba54 100644 --- a/parse/src/test/java/com/parse/NetworkObjectControllerTest.java +++ b/parse/src/test/java/com/parse/NetworkObjectControllerTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/parse/src/test/java/com/parse/OfflineObjectStoreTest.java b/parse/src/test/java/com/parse/OfflineObjectStoreTest.java index 4a847a374..0d6edc8ac 100644 --- a/parse/src/test/java/com/parse/OfflineObjectStoreTest.java +++ b/parse/src/test/java/com/parse/OfflineObjectStoreTest.java @@ -12,11 +12,11 @@ import static junit.framework.Assert.assertSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/OfflineQueryLogicTest.java b/parse/src/test/java/com/parse/OfflineQueryLogicTest.java index fcfa015f1..a36e852fa 100644 --- a/parse/src/test/java/com/parse/OfflineQueryLogicTest.java +++ b/parse/src/test/java/com/parse/OfflineQueryLogicTest.java @@ -12,8 +12,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/parse/src/test/java/com/parse/ParseACLTest.java b/parse/src/test/java/com/parse/ParseACLTest.java index 34ae4c806..34aa29037 100644 --- a/parse/src/test/java/com/parse/ParseACLTest.java +++ b/parse/src/test/java/com/parse/ParseACLTest.java @@ -13,8 +13,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; diff --git a/parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java b/parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java index 48f9bd582..2af283a72 100644 --- a/parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java +++ b/parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java @@ -12,8 +12,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseAnalyticsTest.java b/parse/src/test/java/com/parse/ParseAnalyticsTest.java index 94fa856f9..f01a47b8d 100644 --- a/parse/src/test/java/com/parse/ParseAnalyticsTest.java +++ b/parse/src/test/java/com/parse/ParseAnalyticsTest.java @@ -13,9 +13,9 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -36,7 +36,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.LooperMode; @@ -92,8 +91,7 @@ public void testTrackEventInBackgroundEmptyName() throws Exception { public void testTrackEventInBackgroundNormalName() throws Exception { ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test")); - verify(controller, times(1)) - .trackEventInBackground(eq("test"), Matchers.eq(null), isNull(String.class)); + verify(controller, times(1)).trackEventInBackground(eq("test"), eq(null), isNull()); } @Test @@ -101,8 +99,7 @@ public void testTrackEventInBackgroundNullParameters() throws Exception { ParseTaskUtils.wait( ParseAnalytics.trackEventInBackground("test", (Map) null)); - verify(controller, times(1)) - .trackEventInBackground(eq("test"), Matchers.eq(null), isNull(String.class)); + verify(controller, times(1)).trackEventInBackground(eq("test"), eq(null), isNull()); } @Test @@ -110,8 +107,7 @@ public void testTrackEventInBackgroundEmptyParameters() throws Exception { Map dimensions = new HashMap<>(); ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test", dimensions)); - verify(controller, times(1)) - .trackEventInBackground(eq("test"), eq(dimensions), isNull(String.class)); + verify(controller, times(1)).trackEventInBackground(eq("test"), eq(dimensions), isNull()); } @Test @@ -120,8 +116,7 @@ public void testTrackEventInBackgroundNormalParameters() throws Exception { dimensions.put("key", "value"); ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test", dimensions)); - verify(controller, times(1)) - .trackEventInBackground(eq("test"), eq(dimensions), isNull(String.class)); + verify(controller, times(1)).trackEventInBackground(eq("test"), eq(dimensions), isNull()); } @Test @@ -129,8 +124,7 @@ public void testTrackEventInBackgroundNullCallback() { Map dimensions = new HashMap<>(); ParseAnalytics.trackEventInBackground("test", dimensions, null); - verify(controller, times(1)) - .trackEventInBackground(eq("test"), eq(dimensions), isNull(String.class)); + verify(controller, times(1)).trackEventInBackground(eq("test"), eq(dimensions), isNull()); } @Test @@ -150,8 +144,7 @@ public void testTrackEventInBackgroundNormalCallback() throws Exception { // Make sure the callback is called assertTrue(done.tryAcquire(1, 10, TimeUnit.SECONDS)); - verify(controller, times(1)) - .trackEventInBackground(eq("test"), eq(dimensions), isNull(String.class)); + verify(controller, times(1)).trackEventInBackground(eq("test"), eq(dimensions), isNull()); final Semaphore doneAgain = new Semaphore(0); ParseAnalytics.trackEventInBackground( @@ -165,8 +158,7 @@ public void testTrackEventInBackgroundNormalCallback() throws Exception { // Make sure the callback is called assertTrue(doneAgain.tryAcquire(1, 10, TimeUnit.SECONDS)); - verify(controller, times(1)) - .trackEventInBackground(eq("test"), Matchers.eq(null), isNull(String.class)); + verify(controller, times(1)).trackEventInBackground(eq("test"), eq(null), isNull()); } // endregion @@ -177,8 +169,7 @@ public void testTrackEventInBackgroundNormalCallback() throws Exception { public void testTrackAppOpenedInBackgroundNullIntent() throws Exception { ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(null)); - verify(controller, times(1)) - .trackAppOpenedInBackground(isNull(String.class), isNull(String.class)); + verify(controller, times(1)).trackAppOpenedInBackground(isNull(), isNull()); } @Test @@ -186,8 +177,7 @@ public void testTrackAppOpenedInBackgroundEmptyIntent() throws Exception { Intent intent = new Intent(); ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(intent)); - verify(controller, times(1)) - .trackAppOpenedInBackground(isNull(String.class), isNull(String.class)); + verify(controller, times(1)).trackAppOpenedInBackground(isNull(), isNull()); } @Test @@ -195,7 +185,7 @@ public void testTrackAppOpenedInBackgroundNormalIntent() throws Exception { Intent intent = makeIntentWithParseData("test"); ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(intent)); - verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class)); + verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull()); } @Test @@ -203,11 +193,11 @@ public void testTrackAppOpenedInBackgroundDuplicatedIntent() throws Exception { Intent intent = makeIntentWithParseData("test"); ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(intent)); - verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class)); + verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull()); ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(intent)); - verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class)); + verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull()); } @Test @@ -215,7 +205,7 @@ public void testTrackAppOpenedInBackgroundNullCallback() throws Exception { Intent intent = makeIntentWithParseData("test"); ParseAnalytics.trackAppOpenedInBackground(intent, null); - verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class)); + verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull()); } @Test @@ -233,7 +223,7 @@ public void testTrackAppOpenedInBackgroundNormalCallback() throws Exception { // Make sure the callback is called assertTrue(done.tryAcquire(1, 10, TimeUnit.SECONDS)); - verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class)); + verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull()); } // endregion diff --git a/parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java b/parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java index a115052cd..d637efc2a 100644 --- a/parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java +++ b/parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java @@ -8,6 +8,7 @@ */ package com.parse; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -20,7 +21,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.mockito.Matchers; public class ParseAuthenticationManagerTest { @@ -71,7 +71,7 @@ public void testRegister() { @Test public void testRestoreAuthentication() throws ParseException { when(controller.getAsync(false)).thenReturn(Task.forResult(null)); - when(provider.onRestore(Matchers.>any())).thenReturn(true); + when(provider.onRestore(any())).thenReturn(true); manager.register("test_provider", provider); Map authData = new HashMap<>(); diff --git a/parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java b/parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java index 9de285894..ba3406389 100644 --- a/parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java +++ b/parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseCloudTest.java b/parse/src/test/java/com/parse/ParseCloudTest.java index 19341a8f2..76807af02 100644 --- a/parse/src/test/java/com/parse/ParseCloudTest.java +++ b/parse/src/test/java/com/parse/ParseCloudTest.java @@ -14,11 +14,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyMap; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseConfigControllerTest.java b/parse/src/test/java/com/parse/ParseConfigControllerTest.java index 8d9d08ace..47475529c 100644 --- a/parse/src/test/java/com/parse/ParseConfigControllerTest.java +++ b/parse/src/test/java/com/parse/ParseConfigControllerTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseDefaultACLControllerTest.java b/parse/src/test/java/com/parse/ParseDefaultACLControllerTest.java index 4bea2df51..05855ce50 100644 --- a/parse/src/test/java/com/parse/ParseDefaultACLControllerTest.java +++ b/parse/src/test/java/com/parse/ParseDefaultACLControllerTest.java @@ -13,8 +13,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseFileControllerTest.java b/parse/src/test/java/com/parse/ParseFileControllerTest.java index 8cb8bcdf6..39a0d2222 100644 --- a/parse/src/test/java/com/parse/ParseFileControllerTest.java +++ b/parse/src/test/java/com/parse/ParseFileControllerTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseFileRequestTest.java b/parse/src/test/java/com/parse/ParseFileRequestTest.java index 23805e966..6ba71cfaa 100644 --- a/parse/src/test/java/com/parse/ParseFileRequestTest.java +++ b/parse/src/test/java/com/parse/ParseFileRequestTest.java @@ -8,7 +8,7 @@ */ package com.parse; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/parse/src/test/java/com/parse/ParseFileTest.java b/parse/src/test/java/com/parse/ParseFileTest.java index ce8e3ac75..11c13a5ef 100644 --- a/parse/src/test/java/com/parse/ParseFileTest.java +++ b/parse/src/test/java/com/parse/ParseFileTest.java @@ -13,8 +13,8 @@ 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.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -34,7 +34,6 @@ import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; import org.robolectric.RobolectricTestRunner; @RunWith(RobolectricTestRunner.class) @@ -145,7 +144,7 @@ public void testSaveAsyncNotDirty() throws Exception { any(byte[].class), any(String.class), any(ProgressCallback.class), - Matchers.>any()); + any()); } @Test @@ -168,7 +167,7 @@ public void testSaveAsyncCancelled() throws Exception { any(byte[].class), any(String.class), any(ProgressCallback.class), - Matchers.>any()); + any()); } @Test diff --git a/parse/src/test/java/com/parse/ParseInstallationTest.java b/parse/src/test/java/com/parse/ParseInstallationTest.java index ac481bba2..74d0c0037 100644 --- a/parse/src/test/java/com/parse/ParseInstallationTest.java +++ b/parse/src/test/java/com/parse/ParseInstallationTest.java @@ -14,8 +14,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseObjectTest.java b/parse/src/test/java/com/parse/ParseObjectTest.java index 94a86042c..8aa8d2aa0 100644 --- a/parse/src/test/java/com/parse/ParseObjectTest.java +++ b/parse/src/test/java/com/parse/ParseObjectTest.java @@ -16,10 +16,10 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/parse/src/test/java/com/parse/ParsePushControllerTest.java b/parse/src/test/java/com/parse/ParsePushControllerTest.java index f35940b31..3f28ca233 100644 --- a/parse/src/test/java/com/parse/ParsePushControllerTest.java +++ b/parse/src/test/java/com/parse/ParsePushControllerTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParsePushTest.java b/parse/src/test/java/com/parse/ParsePushTest.java index 072b2c832..ca169a9bd 100644 --- a/parse/src/test/java/com/parse/ParsePushTest.java +++ b/parse/src/test/java/com/parse/ParsePushTest.java @@ -12,9 +12,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseQueryTest.java b/parse/src/test/java/com/parse/ParseQueryTest.java index a2b7442db..6af91cfbf 100644 --- a/parse/src/test/java/com/parse/ParseQueryTest.java +++ b/parse/src/test/java/com/parse/ParseQueryTest.java @@ -16,7 +16,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseRESTCommandTest.java b/parse/src/test/java/com/parse/ParseRESTCommandTest.java index 0d825db2e..9bfbb7f50 100644 --- a/parse/src/test/java/com/parse/ParseRESTCommandTest.java +++ b/parse/src/test/java/com/parse/ParseRESTCommandTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/parse/src/test/java/com/parse/ParseRequestTest.java b/parse/src/test/java/com/parse/ParseRequestTest.java index 06afb8376..f3ec62478 100644 --- a/parse/src/test/java/com/parse/ParseRequestTest.java +++ b/parse/src/test/java/com/parse/ParseRequestTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseTestUtils.java b/parse/src/test/java/com/parse/ParseTestUtils.java index b5c08192c..c3335a652 100644 --- a/parse/src/test/java/com/parse/ParseTestUtils.java +++ b/parse/src/test/java/com/parse/ParseTestUtils.java @@ -8,7 +8,7 @@ */ package com.parse; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/rxjava/build.gradle b/rxjava/build.gradle index 6d7c9995f..a6c7b0ba0 100644 --- a/rxjava/build.gradle +++ b/rxjava/build.gradle @@ -42,7 +42,7 @@ android { dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - api "io.reactivex.rxjava3:rxjava:3.1.0" + api 'io.reactivex.rxjava3:rxjava:3.1.4' implementation project(":parse") } diff --git a/twitter/build.gradle b/twitter/build.gradle index 135397656..35b3d1ae0 100644 --- a/twitter/build.gradle +++ b/twitter/build.gradle @@ -35,8 +35,8 @@ android { } dependencies { - api "androidx.appcompat:appcompat:1.3.1" - api "oauth.signpost:signpost-core:1.2.1.2" + api "androidx.appcompat:appcompat:1.4.1" + api "oauth.signpost:signpost-core:2.1.1" api "se.akerfeldt:okhttp-signpost:1.1.0" implementation project(":parse") diff --git a/twitter/src/test/java/com/parse/twitter/ParseTwitterUtilsTest.java b/twitter/src/test/java/com/parse/twitter/ParseTwitterUtilsTest.java index e16510057..884263448 100644 --- a/twitter/src/test/java/com/parse/twitter/ParseTwitterUtilsTest.java +++ b/twitter/src/test/java/com/parse/twitter/ParseTwitterUtilsTest.java @@ -10,10 +10,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/twitter/src/test/java/com/parse/twitter/TwitterControllerTest.java b/twitter/src/test/java/com/parse/twitter/TwitterControllerTest.java index f11803906..56528b2b5 100644 --- a/twitter/src/test/java/com/parse/twitter/TwitterControllerTest.java +++ b/twitter/src/test/java/com/parse/twitter/TwitterControllerTest.java @@ -11,8 +11,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions;