Skip to content

Commit 4513c36

Browse files
committed
re-run flutterfire configure
add back google-services.json for firestore the firebase/flutterfire#8501 is still present
1 parent d0bf35f commit 4513c36

File tree

5 files changed

+122
-6
lines changed

5 files changed

+122
-6
lines changed

Diff for: android/app/build.gradle

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
plugins {
22
id "com.android.application"
3+
// START: FlutterFire Configuration
4+
id 'com.google.gms.google-services'
5+
id 'com.google.firebase.crashlytics'
6+
// END: FlutterFire Configuration
37
id "kotlin-android"
48
id "dev.flutter.flutter-gradle-plugin"
59
}
@@ -75,4 +79,13 @@ flutter {
7579
source '../..'
7680
}
7781

82+
// ! 🚧 temp solution for firestore bug.
83+
// see https://github.com/firebase/flutterfire/issues/8501#issuecomment-1107883048
84+
configurations.all {
85+
resolutionStrategy {
86+
force 'com.squareup.okhttp:okhttp:2.7.5'
87+
force 'com.squareup.okio:okio:1.17.5'
88+
}
89+
}
90+
7891
dependencies {}

Diff for: android/app/google-services.json

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"project_info": {
3+
"project_number": "785184947614",
4+
"firebase_url": "https://flutter-catalog.firebaseio.com",
5+
"project_id": "flutter-catalog",
6+
"storage_bucket": "flutter-catalog.appspot.com"
7+
},
8+
"client": [
9+
{
10+
"client_info": {
11+
"mobilesdk_app_id": "1:785184947614:android:5457502553a9ce1b",
12+
"android_client_info": {
13+
"package_name": "io.github.x_wei.flutter_catalog"
14+
}
15+
},
16+
"oauth_client": [
17+
{
18+
"client_id": "785184947614-jvcu7agpj6n6vvr5poal14otu8mjdl61.apps.googleusercontent.com",
19+
"client_type": 1,
20+
"android_info": {
21+
"package_name": "io.github.x_wei.flutter_catalog",
22+
"certificate_hash": "00e9ff895bc4ed0b203396da5639ce3385753eff"
23+
}
24+
},
25+
{
26+
"client_id": "785184947614-lp3o8ek63cfj842pa197gbs2s8lh5e6q.apps.googleusercontent.com",
27+
"client_type": 1,
28+
"android_info": {
29+
"package_name": "io.github.x_wei.flutter_catalog",
30+
"certificate_hash": "8ce1c9f33fbdd1c5ffaf05aa5bc1630afe707c10"
31+
}
32+
},
33+
{
34+
"client_id": "785184947614-pan9uvvld12b6s7k190orl6v7v1p68c9.apps.googleusercontent.com",
35+
"client_type": 1,
36+
"android_info": {
37+
"package_name": "io.github.x_wei.flutter_catalog",
38+
"certificate_hash": "2fa93db8ea63f952a0cf73bf6d4c4947b53b7160"
39+
}
40+
},
41+
{
42+
"client_id": "785184947614-rtg325ip2u8jno81hdekdcu8t18qh1ic.apps.googleusercontent.com",
43+
"client_type": 1,
44+
"android_info": {
45+
"package_name": "io.github.x_wei.flutter_catalog",
46+
"certificate_hash": "5fcdcf722c1b9e7deb0bb02902622d0a37d435ec"
47+
}
48+
},
49+
{
50+
"client_id": "785184947614-k4q21aq3rmasodkrj5gjs9qtqtkp89tt.apps.googleusercontent.com",
51+
"client_type": 3
52+
}
53+
],
54+
"api_key": [
55+
{
56+
"current_key": "AIzaSyBcYi_dsaxhGZV1KTn5FObuGEPezTup9As"
57+
}
58+
],
59+
"services": {
60+
"appinvite_service": {
61+
"other_platform_oauth_client": [
62+
{
63+
"client_id": "785184947614-k4q21aq3rmasodkrj5gjs9qtqtkp89tt.apps.googleusercontent.com",
64+
"client_type": 3
65+
},
66+
{
67+
"client_id": "785184947614-70ii5qm94fe28nmasjc9g864nh25l4m7.apps.googleusercontent.com",
68+
"client_type": 2,
69+
"ios_info": {
70+
"bundle_id": "io.github.x-wei.flutter-catalog"
71+
}
72+
}
73+
]
74+
}
75+
}
76+
}
77+
],
78+
"configuration_version": "1"
79+
}

Diff for: android/settings.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ pluginManagement {
2020
plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2222
id "com.android.application" version "7.3.0" apply false
23+
// START: FlutterFire Configuration
24+
id "com.google.gms.google-services" version "4.3.15" apply false
25+
id "com.google.firebase.crashlytics" version "2.8.1" apply false
26+
// END: FlutterFire Configuration
2327
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
2428
}
2529

Diff for: firebase.json

+22-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,26 @@
1212
"destination": "/index.html"
1313
}
1414
]
15+
},
16+
"flutter": {
17+
"platforms": {
18+
"android": {
19+
"default": {
20+
"projectId": "flutter-catalog",
21+
"appId": "1:785184947614:android:5457502553a9ce1b",
22+
"fileOutput": "android/app/google-services.json"
23+
}
24+
},
25+
"dart": {
26+
"lib/firebase_options.dart": {
27+
"projectId": "flutter-catalog",
28+
"configurations": {
29+
"android": "1:785184947614:android:5457502553a9ce1b",
30+
"ios": "1:785184947614:ios:e7733ee4559d7b91f3aa8f",
31+
"web": "1:785184947614:web:4d5471b36872c2dbf3aa8f"
32+
}
33+
}
34+
}
35+
}
1536
}
16-
}
37+
}

Diff for: lib/firebase_options.dart

+4-5
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ class DefaultFirebaseOptions {
7373
projectId: 'flutter-catalog',
7474
databaseURL: 'https://flutter-catalog.firebaseio.com',
7575
storageBucket: 'flutter-catalog.appspot.com',
76-
androidClientId:
77-
'785184947614-jvcu7agpj6n6vvr5poal14otu8mjdl61.apps.googleusercontent.com',
78-
iosClientId:
79-
'785184947614-70ii5qm94fe28nmasjc9g864nh25l4m7.apps.googleusercontent.com',
76+
androidClientId: '785184947614-jvcu7agpj6n6vvr5poal14otu8mjdl61.apps.googleusercontent.com',
77+
iosClientId: '785184947614-70ii5qm94fe28nmasjc9g864nh25l4m7.apps.googleusercontent.com',
8078
iosBundleId: 'io.github.x-wei.flutter-catalog',
8179
);
82-
}
80+
81+
}

0 commit comments

Comments
 (0)