Skip to content

Commit 779dc0b

Browse files
rommansabbirrommansabbir
authored
feat: update various dependencies (#1172)
BREAKING CHANGE: The Facebook Login SDK is upgraded to 13.x; this is a transitive dependency, so if you are directly calling the Facebook Login SDK in your app then this may be a braking change; this release of the Parse Android SDK adds a version range to the Facebook Login SDK dependency for correct gradle dependency resolving
1 parent c658995 commit 779dc0b

38 files changed

+92
-97
lines changed

‎build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = "1.5.31"
2+
ext.kotlin_version = "1.6.20"
33
ext.jacocoVersion = '0.8.7'
44
repositories {
55
google()
66
mavenCentral()
77
}
88
dependencies {
9-
classpath "com.android.tools.build:gradle:7.0.3"
9+
classpath 'com.android.tools.build:gradle:7.1.3'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
classpath "org.jacoco:org.jacoco.core:$jacocoVersion"
1212
classpath "com.dicedmelon.gradle:jacoco-android:0.1.5"
@@ -66,7 +66,8 @@ ext {
6666
minSdkVersion = 21
6767
targetSdkVersion = 31
6868

69-
mockitoCoreVersion = "3.12.4"
69+
mockitoCoreVersion = '4.6.1'
7070
junitVersion = "4.13.2"
71+
jupiterVersion = "5.6.0"
7172
robolectricVersion = "4.7"
7273
}

‎coroutines/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
}
4141

4242
ext {
43-
coroutinesVersion = "1.5.2"
43+
coroutinesVersion = "1.6.1"
4444
}
4545

4646
dependencies {

‎facebook/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535
}
3636

3737
dependencies {
38-
api "com.facebook.android:facebook-login:12.1.0"
38+
api "com.facebook.android:facebook-login:[13.2.0, 14.0["
3939
implementation project(":parse")
4040

4141
testImplementation "junit:junit:$rootProject.ext.junitVersion"

‎facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
import static org.junit.Assert.assertEquals;
1212
import static org.junit.Assert.assertTrue;
13-
import static org.mockito.Matchers.any;
14-
import static org.mockito.Matchers.eq;
13+
import static org.mockito.ArgumentMatchers.any;
14+
import static org.mockito.ArgumentMatchers.eq;
1515
import static org.mockito.Mockito.mock;
1616
import static org.mockito.Mockito.never;
1717
import static org.mockito.Mockito.times;

‎facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
import static org.junit.Assert.assertEquals;
1212
import static org.junit.Assert.assertFalse;
1313
import static org.junit.Assert.assertTrue;
14+
import static org.mockito.ArgumentMatchers.any;
15+
import static org.mockito.ArgumentMatchers.anyInt;
1416
import static org.mockito.ArgumentMatchers.anyList;
1517
import static org.mockito.ArgumentMatchers.anyMap;
18+
import static org.mockito.ArgumentMatchers.anyString;
19+
import static org.mockito.ArgumentMatchers.eq;
1620
import static org.mockito.ArgumentMatchers.nullable;
17-
import static org.mockito.Matchers.any;
18-
import static org.mockito.Matchers.anyInt;
19-
import static org.mockito.Matchers.anyString;
20-
import static org.mockito.Matchers.eq;
2121
import static org.mockito.Mockito.doThrow;
2222
import static org.mockito.Mockito.mock;
2323
import static org.mockito.Mockito.never;

‎fcm/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ android {
3636
}
3737

3838
dependencies {
39-
api "com.google.firebase:firebase-messaging:23.0.0"
39+
api 'com.google.firebase:firebase-messaging:23.0.3'
4040
implementation project(":parse")
4141
}
4242

‎google/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ android {
4141

4242
dependencies {
4343
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
44-
api "com.google.android.gms:play-services-auth:19.2.0"
45-
api "androidx.activity:activity-ktx:1.3.1"
46-
api "androidx.fragment:fragment-ktx:1.3.1"
44+
api "com.google.android.gms:play-services-auth:20.1.0"
45+
api "androidx.activity:activity-ktx:1.4.0"
46+
api "androidx.fragment:fragment-ktx:1.4.1"
4747
implementation project(":parse")
4848
}
4949

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Nov 16 15:15:09 EET 2021
1+
#Sat Apr 16 09:27:50 CEST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

‎parse/build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ ext {
4747

4848
dependencies {
4949
api "androidx.annotation:annotation:1.3.0"
50-
api "androidx.core:core:1.7.0"
50+
api "androidx.core:core:1.8.0"
5151
api "com.squareup.okhttp3:okhttp:$okhttpVersion"
5252
api project(':bolts-tasks')
5353

54+
testImplementation "org.junit.jupiter:junit-jupiter:$rootProject.ext.jupiterVersion"
5455
testImplementation "org.skyscreamer:jsonassert:1.5.0"
5556
testImplementation "junit:junit:$rootProject.ext.junitVersion"
5657
testImplementation "org.mockito:mockito-core:$rootProject.ext.mockitoCoreVersion"
@@ -88,6 +89,10 @@ tasks.withType(Test) {
8889
}
8990
}
9091

92+
tasks.withType(Test) {
93+
useJUnitPlatform()
94+
}
95+
9196
jacocoAndroidUnitTestReport {
9297
csv.enabled false
9398
html.enabled true

‎parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import static org.junit.Assert.assertNull;
1414
import static org.junit.Assert.assertSame;
1515
import static org.junit.Assert.assertTrue;
16-
import static org.mockito.Matchers.anyBoolean;
16+
import static org.mockito.ArgumentMatchers.anyBoolean;
1717
import static org.mockito.Mockito.mock;
1818
import static org.mockito.Mockito.times;
1919
import static org.mockito.Mockito.verify;

‎parse/src/test/java/com/parse/EventuallyPinTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.parse;
22

3+
import static org.mockito.ArgumentMatchers.any;
4+
import static org.mockito.ArgumentMatchers.eq;
35
import static org.mockito.ArgumentMatchers.nullable;
4-
import static org.mockito.Matchers.any;
5-
import static org.mockito.Matchers.eq;
66
import static org.mockito.Mockito.mock;
77
import static org.mockito.Mockito.when;
88

‎parse/src/test/java/com/parse/FileObjectStoreTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import static org.junit.Assert.assertEquals;
1212
import static org.junit.Assert.assertFalse;
1313
import static org.junit.Assert.assertTrue;
14-
import static org.mockito.Matchers.any;
15-
import static org.mockito.Matchers.eq;
16-
import static org.mockito.Matchers.isNull;
14+
import static org.mockito.ArgumentMatchers.any;
15+
import static org.mockito.ArgumentMatchers.eq;
16+
import static org.mockito.ArgumentMatchers.isNull;
1717
import static org.mockito.Mockito.mock;
1818
import static org.mockito.Mockito.when;
1919
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;

‎parse/src/test/java/com/parse/NetworkObjectControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import static org.junit.Assert.assertEquals;
1212
import static org.junit.Assert.assertFalse;
1313
import static org.junit.Assert.assertTrue;
14-
import static org.mockito.Matchers.any;
14+
import static org.mockito.ArgumentMatchers.any;
1515
import static org.mockito.Mockito.mock;
1616
import static org.mockito.Mockito.when;
1717

‎parse/src/test/java/com/parse/OfflineObjectStoreTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import static junit.framework.Assert.assertSame;
1313
import static org.junit.Assert.assertNull;
1414
import static org.junit.Assert.assertTrue;
15+
import static org.mockito.ArgumentMatchers.any;
16+
import static org.mockito.ArgumentMatchers.anyBoolean;
17+
import static org.mockito.ArgumentMatchers.anyList;
18+
import static org.mockito.ArgumentMatchers.anyString;
1519
import static org.mockito.ArgumentMatchers.nullable;
16-
import static org.mockito.Matchers.any;
17-
import static org.mockito.Matchers.anyBoolean;
18-
import static org.mockito.Matchers.anyList;
19-
import static org.mockito.Matchers.anyString;
2020
import static org.mockito.Mockito.mock;
2121
import static org.mockito.Mockito.times;
2222
import static org.mockito.Mockito.verify;

‎parse/src/test/java/com/parse/OfflineQueryLogicTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import static org.junit.Assert.assertEquals;
1313
import static org.junit.Assert.assertFalse;
1414
import static org.junit.Assert.assertTrue;
15+
import static org.mockito.ArgumentMatchers.any;
1516
import static org.mockito.ArgumentMatchers.nullable;
16-
import static org.mockito.Matchers.any;
1717
import static org.mockito.Mockito.mock;
1818
import static org.mockito.Mockito.never;
1919
import static org.mockito.Mockito.times;

‎parse/src/test/java/com/parse/ParseACLTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import static org.junit.Assert.assertNull;
1414
import static org.junit.Assert.assertSame;
1515
import static org.junit.Assert.assertTrue;
16-
import static org.mockito.Matchers.any;
17-
import static org.mockito.Matchers.eq;
16+
import static org.mockito.ArgumentMatchers.any;
17+
import static org.mockito.ArgumentMatchers.eq;
1818
import static org.mockito.Mockito.mock;
1919
import static org.mockito.Mockito.reset;
2020
import static org.mockito.Mockito.times;

‎parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import static org.junit.Assert.assertNull;
1313
import static org.junit.Assert.assertSame;
1414
import static org.junit.Assert.assertTrue;
15+
import static org.mockito.ArgumentMatchers.any;
1516
import static org.mockito.ArgumentMatchers.nullable;
16-
import static org.mockito.Matchers.any;
1717
import static org.mockito.Mockito.mock;
1818
import static org.mockito.Mockito.times;
1919
import static org.mockito.Mockito.verify;

‎parse/src/test/java/com/parse/ParseAnalyticsTest.java

+17-27
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import static org.junit.Assert.assertSame;
1414
import static org.junit.Assert.assertTrue;
1515
import static org.mockito.ArgumentMatchers.anyMap;
16-
import static org.mockito.Matchers.anyString;
17-
import static org.mockito.Matchers.eq;
18-
import static org.mockito.Matchers.isNull;
16+
import static org.mockito.ArgumentMatchers.anyString;
17+
import static org.mockito.ArgumentMatchers.eq;
18+
import static org.mockito.ArgumentMatchers.isNull;
1919
import static org.mockito.Mockito.mock;
2020
import static org.mockito.Mockito.times;
2121
import static org.mockito.Mockito.verify;
@@ -36,7 +36,6 @@
3636
import org.junit.Before;
3737
import org.junit.Test;
3838
import org.junit.runner.RunWith;
39-
import org.mockito.Matchers;
4039
import org.robolectric.RobolectricTestRunner;
4140
import org.robolectric.annotation.LooperMode;
4241

@@ -92,26 +91,23 @@ public void testTrackEventInBackgroundEmptyName() throws Exception {
9291
public void testTrackEventInBackgroundNormalName() throws Exception {
9392
ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test"));
9493

95-
verify(controller, times(1))
96-
.trackEventInBackground(eq("test"), Matchers.eq(null), isNull(String.class));
94+
verify(controller, times(1)).trackEventInBackground(eq("test"), eq(null), isNull());
9795
}
9896

9997
@Test
10098
public void testTrackEventInBackgroundNullParameters() throws Exception {
10199
ParseTaskUtils.wait(
102100
ParseAnalytics.trackEventInBackground("test", (Map<String, String>) null));
103101

104-
verify(controller, times(1))
105-
.trackEventInBackground(eq("test"), Matchers.eq(null), isNull(String.class));
102+
verify(controller, times(1)).trackEventInBackground(eq("test"), eq(null), isNull());
106103
}
107104

108105
@Test
109106
public void testTrackEventInBackgroundEmptyParameters() throws Exception {
110107
Map<String, String> dimensions = new HashMap<>();
111108
ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test", dimensions));
112109

113-
verify(controller, times(1))
114-
.trackEventInBackground(eq("test"), eq(dimensions), isNull(String.class));
110+
verify(controller, times(1)).trackEventInBackground(eq("test"), eq(dimensions), isNull());
115111
}
116112

117113
@Test
@@ -120,17 +116,15 @@ public void testTrackEventInBackgroundNormalParameters() throws Exception {
120116
dimensions.put("key", "value");
121117
ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test", dimensions));
122118

123-
verify(controller, times(1))
124-
.trackEventInBackground(eq("test"), eq(dimensions), isNull(String.class));
119+
verify(controller, times(1)).trackEventInBackground(eq("test"), eq(dimensions), isNull());
125120
}
126121

127122
@Test
128123
public void testTrackEventInBackgroundNullCallback() {
129124
Map<String, String> dimensions = new HashMap<>();
130125
ParseAnalytics.trackEventInBackground("test", dimensions, null);
131126

132-
verify(controller, times(1))
133-
.trackEventInBackground(eq("test"), eq(dimensions), isNull(String.class));
127+
verify(controller, times(1)).trackEventInBackground(eq("test"), eq(dimensions), isNull());
134128
}
135129

136130
@Test
@@ -150,8 +144,7 @@ public void testTrackEventInBackgroundNormalCallback() throws Exception {
150144

151145
// Make sure the callback is called
152146
assertTrue(done.tryAcquire(1, 10, TimeUnit.SECONDS));
153-
verify(controller, times(1))
154-
.trackEventInBackground(eq("test"), eq(dimensions), isNull(String.class));
147+
verify(controller, times(1)).trackEventInBackground(eq("test"), eq(dimensions), isNull());
155148

156149
final Semaphore doneAgain = new Semaphore(0);
157150
ParseAnalytics.trackEventInBackground(
@@ -165,8 +158,7 @@ public void testTrackEventInBackgroundNormalCallback() throws Exception {
165158

166159
// Make sure the callback is called
167160
assertTrue(doneAgain.tryAcquire(1, 10, TimeUnit.SECONDS));
168-
verify(controller, times(1))
169-
.trackEventInBackground(eq("test"), Matchers.eq(null), isNull(String.class));
161+
verify(controller, times(1)).trackEventInBackground(eq("test"), eq(null), isNull());
170162
}
171163

172164
// endregion
@@ -177,45 +169,43 @@ public void testTrackEventInBackgroundNormalCallback() throws Exception {
177169
public void testTrackAppOpenedInBackgroundNullIntent() throws Exception {
178170
ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(null));
179171

180-
verify(controller, times(1))
181-
.trackAppOpenedInBackground(isNull(String.class), isNull(String.class));
172+
verify(controller, times(1)).trackAppOpenedInBackground(isNull(), isNull());
182173
}
183174

184175
@Test
185176
public void testTrackAppOpenedInBackgroundEmptyIntent() throws Exception {
186177
Intent intent = new Intent();
187178
ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(intent));
188179

189-
verify(controller, times(1))
190-
.trackAppOpenedInBackground(isNull(String.class), isNull(String.class));
180+
verify(controller, times(1)).trackAppOpenedInBackground(isNull(), isNull());
191181
}
192182

193183
@Test
194184
public void testTrackAppOpenedInBackgroundNormalIntent() throws Exception {
195185
Intent intent = makeIntentWithParseData("test");
196186
ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(intent));
197187

198-
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class));
188+
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull());
199189
}
200190

201191
@Test
202192
public void testTrackAppOpenedInBackgroundDuplicatedIntent() throws Exception {
203193
Intent intent = makeIntentWithParseData("test");
204194
ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(intent));
205195

206-
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class));
196+
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull());
207197

208198
ParseTaskUtils.wait(ParseAnalytics.trackAppOpenedInBackground(intent));
209199

210-
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class));
200+
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull());
211201
}
212202

213203
@Test
214204
public void testTrackAppOpenedInBackgroundNullCallback() throws Exception {
215205
Intent intent = makeIntentWithParseData("test");
216206
ParseAnalytics.trackAppOpenedInBackground(intent, null);
217207

218-
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class));
208+
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull());
219209
}
220210

221211
@Test
@@ -233,7 +223,7 @@ public void testTrackAppOpenedInBackgroundNormalCallback() throws Exception {
233223

234224
// Make sure the callback is called
235225
assertTrue(done.tryAcquire(1, 10, TimeUnit.SECONDS));
236-
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull(String.class));
226+
verify(controller, times(1)).trackAppOpenedInBackground(eq("test"), isNull());
237227
}
238228

239229
// endregion

‎parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99
package com.parse;
1010

11+
import static org.mockito.ArgumentMatchers.any;
1112
import static org.mockito.Mockito.mock;
1213
import static org.mockito.Mockito.verify;
1314
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -20,7 +21,6 @@
2021
import org.junit.Rule;
2122
import org.junit.Test;
2223
import org.junit.rules.ExpectedException;
23-
import org.mockito.Matchers;
2424

2525
public class ParseAuthenticationManagerTest {
2626

@@ -71,7 +71,7 @@ public void testRegister() {
7171
@Test
7272
public void testRestoreAuthentication() throws ParseException {
7373
when(controller.getAsync(false)).thenReturn(Task.<ParseUser>forResult(null));
74-
when(provider.onRestore(Matchers.<Map<String, String>>any())).thenReturn(true);
74+
when(provider.onRestore(any())).thenReturn(true);
7575
manager.register("test_provider", provider);
7676

7777
Map<String, String> authData = new HashMap<>();

0 commit comments

Comments
 (0)