Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f60396e

Browse files
samtsternsamtstern
committed
Update for M24
Change-Id: I9cea98439d07471585f50e33c09eb3eaaea83fd1
1 parent 931f5f8 commit f60396e

File tree

8 files changed

+15
-18
lines changed

8 files changed

+15
-18
lines changed

‎auth/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
dependencies {
2323
implementation "com.android.support:support-v4:27.1.1"
2424
implementation "com.android.support:appcompat-v7:27.1.1"
25-
implementation "com.google.firebase:firebase-auth:15.0.0"
25+
implementation "com.google.firebase:firebase-auth:15.1.0"
2626
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
2727
}
2828
repositories {

‎firestore/app/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ android {
1010
targetSdkVersion 27
1111
versionCode 1
1212
versionName "1.0"
13+
multiDexEnabled true
1314
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1415
}
1516
buildTypes {
@@ -30,12 +31,13 @@ dependencies {
3031
implementation "com.android.support:support-v4:27.1.1"
3132
implementation "com.android.support:appcompat-v7:27.1.1"
3233
implementation "com.android.support.constraint:constraint-layout:1.1.0"
34+
implementation "com.android.support:multidex:1.0.3"
3335

3436
// Firestore
35-
implementation "com.google.firebase:firebase-firestore:15.0.0"
37+
implementation "com.google.firebase:firebase-firestore:16.0.0"
3638

3739
// Firebase / Play Services
38-
implementation "com.google.firebase:firebase-auth:15.0.0"
40+
implementation "com.google.firebase:firebase-auth:15.1.0"
3941
implementation "com.google.android.gms:play-services-auth:15.0.0"
4042
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.31"
4143
}

‎firestore/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
11+
android:theme="@style/AppTheme"
12+
android:name="android.support.multidex.MultiDexApplication">
1213
<activity android:name=".MainActivity">
1314
<intent-filter>
1415
<action android:name="android.intent.action.MAIN" />

‎firestore/app/src/main/java/com/google/example/firestore/DocSnippets.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.google.firebase.firestore.CollectionReference;
1414
import com.google.firebase.firestore.DocumentChange;
1515
import com.google.firebase.firestore.DocumentChange.Type;
16-
import com.google.firebase.firestore.DocumentListenOptions;
1716
import com.google.firebase.firestore.DocumentReference;
1817
import com.google.firebase.firestore.DocumentSnapshot;
1918
import com.google.firebase.firestore.EventListener;
@@ -23,6 +22,7 @@
2322
import com.google.firebase.firestore.FirebaseFirestoreException;
2423
import com.google.firebase.firestore.FirebaseFirestoreSettings;
2524
import com.google.firebase.firestore.ListenerRegistration;
25+
import com.google.firebase.firestore.MetadataChanges;
2626
import com.google.firebase.firestore.Query;
2727
import com.google.firebase.firestore.Query.Direction;
2828
import com.google.firebase.firestore.QueryDocumentSnapshot;
@@ -677,11 +677,8 @@ public void onEvent(@Nullable DocumentSnapshot snapshot,
677677
public void listenWithMetadata() {
678678
// [START listen_with_metadata]
679679
// Listen for metadata changes to the document.
680-
DocumentListenOptions options = new DocumentListenOptions()
681-
.includeMetadataChanges();
682-
683680
DocumentReference docRef = db.collection("cities").document("SF");
684-
docRef.addSnapshotListener(options, new EventListener<DocumentSnapshot>() {
681+
docRef.addSnapshotListener(MetadataChanges.INCLUDE, new EventListener<DocumentSnapshot>() {
685682
@Override
686683
public void onEvent(@Nullable DocumentSnapshot snapshot,
687684
@Nullable FirebaseFirestoreException e) {

‎firestore/app/src/main/java/com/google/example/firestore/SolutionRateLimiting.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import android.support.annotation.Nullable;
55
import android.util.Log;
66

7-
import com.google.firebase.firestore.DocumentListenOptions;
87
import com.google.firebase.firestore.DocumentReference;
98
import com.google.firebase.firestore.DocumentSnapshot;
109
import com.google.firebase.firestore.EventListener;
1110
import com.google.firebase.firestore.FieldValue;
1211
import com.google.firebase.firestore.FirebaseFirestore;
1312
import com.google.firebase.firestore.FirebaseFirestoreException;
1413
import com.google.firebase.firestore.ListenerRegistration;
14+
import com.google.firebase.firestore.MetadataChanges;
1515
import com.google.firebase.firestore.SetOptions;
1616

1717
import java.util.HashMap;
@@ -44,8 +44,7 @@ public void startUpdates() {
4444

4545
// Listen to the document, including metadata changes so we get notified
4646
// when writes have propagated to the server.
47-
DocumentListenOptions options = new DocumentListenOptions().includeMetadataChanges();
48-
mRegistration = reference.addSnapshotListener(options, new EventListener<DocumentSnapshot>() {
47+
mRegistration = reference.addSnapshotListener(MetadataChanges.INCLUDE, new EventListener<DocumentSnapshot>() {
4948
@Override
5049
public void onEvent(@Nullable DocumentSnapshot documentSnapshot,
5150
@Nullable FirebaseFirestoreException e) {

‎firestore/app/src/main/java/com/google/example/firestore/kotlin/DocSnippets.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,10 +470,8 @@ class DocSnippets(val db: FirebaseFirestore) : DocSnippetsInterface {
470470
override fun listenWithMetadata() {
471471
// [START listen_with_metadata]
472472
// Listen for metadata changes to the document.
473-
val options = DocumentListenOptions().includeMetadataChanges()
474-
475473
val docRef = db.collection("cities").document("SF")
476-
docRef.addSnapshotListener(options) { snapshot, e ->
474+
docRef.addSnapshotListener(MetadataChanges.INCLUDE) { snapshot, e ->
477475
// ...
478476
}
479477
// [END listen_with_metadata]

‎storage/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
dependencies {
2222
implementation "com.android.support:support-v4:27.1.1"
2323
implementation "com.android.support:appcompat-v7:27.1.1"
24-
implementation "com.google.firebase:firebase-storage:15.0.0"
24+
implementation "com.google.firebase:firebase-storage:15.0.2"
2525
}
2626

2727
apply plugin: 'com.google.gms.google-services'

‎tasks/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ dependencies {
2323
implementation "com.android.support:support-v4:27.1.1"
2424
implementation "com.android.support:appcompat-v7:27.1.1"
2525

26-
implementation "com.google.firebase:firebase-auth:15.0.0"
27-
implementation "com.google.firebase:firebase-storage:15.0.0"
26+
implementation "com.google.firebase:firebase-auth:15.1.0"
27+
implementation "com.google.firebase:firebase-storage:15.0.2"
2828
}

0 commit comments

Comments
 (0)