Skip to content

Commit 779dc0b

Browse files
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

Lines changed: 4 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 6 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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;

0 commit comments

Comments
 (0)