Skip to content

Commit e6069b3

Browse files
TarekkMArussellwheatley
TarekkMA
and
russellwheatley
authored
chore(cloud_firestore): upgrade gradle (#12875)
* chore(cloud_firestore): upgrade gradle * remove todo * revert gradle url --------- Co-authored-by: Russell Wheatley <[email protected]>
1 parent f67914c commit e6069b3

File tree

14 files changed

+196
-75
lines changed

14 files changed

+196
-75
lines changed

‎packages/cloud_firestore/cloud_firestore/example/.metadata

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,27 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 7e9793dee1b85a243edd0e06cb1658e98b077561
8-
channel: stable
7+
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
8+
channel: "stable"
99

1010
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
17+
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
18+
- platform: android
19+
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
20+
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
21+
22+
# User provided section
23+
24+
# List of Local paths (relative to this file) that should be
25+
# ignored by the migrate tool.
26+
#
27+
# Files that are not part of the templates will be ignored by default.
28+
unmanaged_files:
29+
- 'lib/main.dart'
30+
- 'ios/Runner.xcodeproj/project.pbxproj'

‎packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,60 @@
11
plugins {
22
id "com.android.application"
3+
// START: FlutterFire Configuration
4+
id 'com.google.gms.google-services'
5+
// END: FlutterFire Configuration
36
id "kotlin-android"
7+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
48
id "dev.flutter.flutter-gradle-plugin"
5-
id "com.google.gms.google-services"
69
}
710

811
def localProperties = new Properties()
9-
def localPropertiesFile = rootProject.file('local.properties')
12+
def localPropertiesFile = rootProject.file("local.properties")
1013
if (localPropertiesFile.exists()) {
11-
localPropertiesFile.withReader('UTF-8') { reader ->
14+
localPropertiesFile.withReader("UTF-8") { reader ->
1215
localProperties.load(reader)
1316
}
1417
}
1518

16-
17-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
19+
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
1820
if (flutterVersionCode == null) {
19-
flutterVersionCode = '1'
21+
flutterVersionCode = "1"
2022
}
2123

22-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
24+
def flutterVersionName = localProperties.getProperty("flutter.versionName")
2325
if (flutterVersionName == null) {
24-
flutterVersionName = '1.0'
26+
flutterVersionName = "1.0"
2527
}
2628

27-
2829
android {
29-
namespace 'io.flutter.plugins.firebase.firestore.example'
30-
31-
compileSdk 34
32-
33-
defaultConfig {
34-
applicationId "io.flutter.plugins.firebase.firestore.example"
35-
minSdk 21
36-
targetSdk 34
37-
versionCode flutterVersionCode.toInteger()
38-
versionName flutterVersionName
39-
}
30+
namespace = "io.flutter.plugins.firebase.firestore.example"
31+
compileSdk = flutter.compileSdkVersion
32+
ndkVersion = flutter.ndkVersion
4033

4134
compileOptions {
42-
sourceCompatibility JavaVersion.VERSION_1_8
43-
targetCompatibility JavaVersion.VERSION_1_8
44-
}
45-
46-
kotlinOptions {
47-
jvmTarget = '1.8'
35+
sourceCompatibility = JavaVersion.VERSION_1_8
36+
targetCompatibility = JavaVersion.VERSION_1_8
4837
}
4938

50-
sourceSets {
51-
main.java.srcDirs += 'src/main/kotlin'
39+
defaultConfig {
40+
applicationId = "io.flutter.plugins.firebase.firestore.example"
41+
// You can update the following values to match your application needs.
42+
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
43+
minSdk = flutter.minSdkVersion
44+
targetSdk = flutter.targetSdkVersion
45+
versionCode = flutterVersionCode.toInteger()
46+
versionName = flutterVersionName
5247
}
5348

5449
buildTypes {
5550
release {
5651
// TODO: Add your own signing config for the release build.
5752
// Signing with the debug keys for now, so `flutter run --release` works.
58-
signingConfig signingConfigs.debug
53+
signingConfig = signingConfigs.debug
5954
}
6055
}
6156
}
6257

6358
flutter {
64-
source '../..'
59+
source = "../.."
6560
}
66-

‎packages/cloud_firestore/cloud_firestore/example/android/app/google-services.json

Lines changed: 116 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,42 @@
66
"storage_bucket": "flutterfire-e2e-tests.appspot.com"
77
},
88
"client": [
9+
{
10+
"client_info": {
11+
"mobilesdk_app_id": "1:406099696497:android:d86a91cc7b338b233574d0",
12+
"android_client_info": {
13+
"package_name": "io.flutter.plugins.firebase.analytics.example"
14+
}
15+
},
16+
"oauth_client": [
17+
{
18+
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
19+
"client_type": 3
20+
}
21+
],
22+
"api_key": [
23+
{
24+
"current_key": "AIzaSyCdRjCVZlhrq72RuEklEyyxYlBRCYhI2Sw"
25+
}
26+
],
27+
"services": {
28+
"appinvite_service": {
29+
"other_platform_oauth_client": [
30+
{
31+
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
32+
"client_type": 3
33+
},
34+
{
35+
"client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
36+
"client_type": 2,
37+
"ios_info": {
38+
"bundle_id": "io.flutter.plugins.firebase.example"
39+
}
40+
}
41+
]
42+
}
43+
}
44+
},
945
{
1046
"client_info": {
1147
"mobilesdk_app_id": "1:406099696497:android:a241c4b471513a203574d0",
@@ -50,6 +86,58 @@
5086
}
5187
}
5288
},
89+
{
90+
"client_info": {
91+
"mobilesdk_app_id": "1:406099696497:android:21d5142deea38dda3574d0",
92+
"android_client_info": {
93+
"package_name": "io.flutter.plugins.firebase.auth.example"
94+
}
95+
},
96+
"oauth_client": [
97+
{
98+
"client_id": "406099696497-emmujnd7g2ammh5uu9ni6v04p4ateqac.apps.googleusercontent.com",
99+
"client_type": 1,
100+
"android_info": {
101+
"package_name": "io.flutter.plugins.firebase.auth.example",
102+
"certificate_hash": "5ad0d6d5cbe577ca185b8df246656bebc3957128"
103+
}
104+
},
105+
{
106+
"client_id": "406099696497-in8bfp0nali85oul1o98huoar6eo1vv1.apps.googleusercontent.com",
107+
"client_type": 1,
108+
"android_info": {
109+
"package_name": "io.flutter.plugins.firebase.auth.example",
110+
"certificate_hash": "909ca1482ef022bbae45a2db6b6d05d807a4c4aa"
111+
}
112+
},
113+
{
114+
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
115+
"client_type": 3
116+
}
117+
],
118+
"api_key": [
119+
{
120+
"current_key": "AIzaSyCdRjCVZlhrq72RuEklEyyxYlBRCYhI2Sw"
121+
}
122+
],
123+
"services": {
124+
"appinvite_service": {
125+
"other_platform_oauth_client": [
126+
{
127+
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
128+
"client_type": 3
129+
},
130+
{
131+
"client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
132+
"client_type": 2,
133+
"ios_info": {
134+
"bundle_id": "io.flutter.plugins.firebase.example"
135+
}
136+
}
137+
]
138+
}
139+
}
140+
},
53141
{
54142
"client_info": {
55143
"mobilesdk_app_id": "1:406099696497:android:3ef965ff044efc0b3574d0",
@@ -212,9 +300,9 @@
212300
},
213301
{
214302
"client_info": {
215-
"mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0",
303+
"mobilesdk_app_id": "1:406099696497:android:6d1c1fbf4688f39c3574d0",
216304
"android_client_info": {
217-
"package_name": "io.flutter.plugins.firebase.messaging.example"
305+
"package_name": "io.flutter.plugins.firebase.installations.example"
218306
}
219307
},
220308
"oauth_client": [
@@ -248,9 +336,9 @@
248336
},
249337
{
250338
"client_info": {
251-
"mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0",
339+
"mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0",
252340
"android_client_info": {
253-
"package_name": "io.flutter.plugins.firebase.tests"
341+
"package_name": "io.flutter.plugins.firebase.messaging.example"
254342
}
255343
},
256344
"oauth_client": [
@@ -284,20 +372,12 @@
284372
},
285373
{
286374
"client_info": {
287-
"mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0",
375+
"mobilesdk_app_id": "1:406099696497:android:f54b85cfa36a39f73574d0",
288376
"android_client_info": {
289-
"package_name": "io.flutter.plugins.firebase_ui_example"
377+
"package_name": "io.flutter.plugins.firebase.remoteconfig.example"
290378
}
291379
},
292380
"oauth_client": [
293-
{
294-
"client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com",
295-
"client_type": 1,
296-
"android_info": {
297-
"package_name": "io.flutter.plugins.firebase_ui_example",
298-
"certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6"
299-
}
300-
},
301381
{
302382
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
303383
"client_type": 3
@@ -328,12 +408,28 @@
328408
},
329409
{
330410
"client_info": {
331-
"mobilesdk_app_id": "1:406099696497:android:b7a347ba65ca3b803574d0",
411+
"mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0",
332412
"android_client_info": {
333-
"package_name": "io.flutter.plugins.firebaseanalyticsexample"
413+
"package_name": "io.flutter.plugins.firebase.tests"
334414
}
335415
},
336416
"oauth_client": [
417+
{
418+
"client_id": "406099696497-ib9hj9281l3343cm3nfvvdotaojrthdc.apps.googleusercontent.com",
419+
"client_type": 1,
420+
"android_info": {
421+
"package_name": "io.flutter.plugins.firebase.tests",
422+
"certificate_hash": "5ad0d6d5cbe577ca185b8df246656bebc3957128"
423+
}
424+
},
425+
{
426+
"client_id": "406099696497-lc54d5l8sp90k39r0bb39ovsgo1s9bek.apps.googleusercontent.com",
427+
"client_type": 1,
428+
"android_info": {
429+
"package_name": "io.flutter.plugins.firebase.tests",
430+
"certificate_hash": "909ca1482ef022bbae45a2db6b6d05d807a4c4aa"
431+
}
432+
},
337433
{
338434
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
339435
"client_type": 3
@@ -364,17 +460,17 @@
364460
},
365461
{
366462
"client_info": {
367-
"mobilesdk_app_id": "1:406099696497:android:61e67dfd35ab93ad3574d0",
463+
"mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0",
368464
"android_client_info": {
369-
"package_name": "io.flutter.plugins.firebaseauthexample"
465+
"package_name": "io.flutter.plugins.firebase_ui_example"
370466
}
371467
},
372468
"oauth_client": [
373469
{
374-
"client_id": "406099696497-j20pm6c84pofkl1ivo4f7fe797smfnp4.apps.googleusercontent.com",
470+
"client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com",
375471
"client_type": 1,
376472
"android_info": {
377-
"package_name": "io.flutter.plugins.firebaseauthexample",
473+
"package_name": "io.flutter.plugins.firebase_ui_example",
378474
"certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6"
379475
}
380476
},

‎packages/cloud_firestore/cloud_firestore/example/android/app/src/debug/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="io.flutter.plugins.firebase.firestore.example">
3-
<!-- Flutter needs it to communicate with the running application
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<!-- The INTERNET permission is required for development. Specifically,
3+
the Flutter tool needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->
66
<uses-permission android:name="android.permission.INTERNET"/>

‎packages/cloud_firestore/cloud_firestore/example/android/app/src/main/AndroidManifest.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="io.flutter.plugins.firebase.firestore.example">
3-
<application
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<application
43
android:label="example"
54
android:name="${applicationName}"
65
android:icon="@mipmap/ic_launcher">
76
<activity
87
android:name=".MainActivity"
98
android:exported="true"
109
android:launchMode="singleTop"
10+
android:taskAffinity=""
1111
android:theme="@style/LaunchTheme"
1212
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1313
android:hardwareAccelerated="true"
@@ -31,4 +31,15 @@
3131
android:name="flutterEmbedding"
3232
android:value="2" />
3333
</application>
34+
<!-- Required to query activities that can process text, see:
35+
https://developer.android.com/training/package-visibility and
36+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
37+
38+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
39+
<queries>
40+
<intent>
41+
<action android:name="android.intent.action.PROCESS_TEXT"/>
42+
<data android:mimeType="text/plain"/>
43+
</intent>
44+
</queries>
3445
</manifest>

‎packages/cloud_firestore/cloud_firestore/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/firestore/example/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package io.flutter.plugins.firebase.firestore.example
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity: FlutterActivity()

‎packages/cloud_firestore/cloud_firestore/example/android/app/src/main/res/values-night/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
44
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.

‎packages/cloud_firestore/cloud_firestore/example/android/app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
44
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.

0 commit comments

Comments
 (0)