Skip to content

Commit aeaa96e

Browse files
chore(cloud_functions): update gradle (#12876)
Co-authored-by: Russell Wheatley <[email protected]>
1 parent dfeeb6b commit aeaa96e

File tree

17 files changed

+317
-113
lines changed

17 files changed

+317
-113
lines changed
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
6+
.DS_Store
7+
.atom/
8+
.buildlog/
9+
.history
10+
.svn/
11+
migrate_working_dir/
12+
13+
# IntelliJ related
14+
*.iml
15+
*.ipr
16+
*.iws
17+
.idea/
18+
19+
# The .vscode folder contains launch configuration and tasks you configure in
20+
# VS Code which you may wish to be included in version control, so this line
21+
# is commented out by default.
22+
#.vscode/
23+
24+
# Flutter/Dart/Pub related
25+
**/doc/api/
26+
**/ios/Flutter/.last_build_id
27+
.dart_tool/
28+
.flutter-plugins
29+
.flutter-plugins-dependencies
30+
.pub-cache/
31+
.pub/
32+
/build/
33+
34+
# Symbolication related
35+
app.*.symbols
36+
37+
# Obfuscation related
38+
app.*.map.json
39+
40+
# Android Studio will place build artifacts here
41+
/android/app/debug
42+
/android/app/profile
43+
/android/app/release

packages/cloud_functions/cloud_functions/example/.metadata

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

66
version:
7-
revision: b135fb3795a16ab2b884820ed7a67d650338aac3
8-
channel: master
7+
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
8+
channel: "stable"
9+
10+
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'
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
6+
/local.properties
7+
GeneratedPluginRegistrant.java
8+
9+
# Remember to never publicly share your keystore.
10+
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
11+
key.properties
12+
**/*.keystore
13+
**/*.jks
Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,60 @@
1+
plugins {
2+
id "com.android.application"
3+
// START: FlutterFire Configuration
4+
id 'com.google.gms.google-services'
5+
// END: FlutterFire Configuration
6+
id "kotlin-android"
7+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
8+
id "dev.flutter.flutter-gradle-plugin"
9+
}
10+
111
def localProperties = new Properties()
2-
def localPropertiesFile = rootProject.file('local.properties')
12+
def localPropertiesFile = rootProject.file("local.properties")
313
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withReader('UTF-8') { reader ->
14+
localPropertiesFile.withReader("UTF-8") { reader ->
515
localProperties.load(reader)
616
}
717
}
818

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
14-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
19+
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
1520
if (flutterVersionCode == null) {
16-
flutterVersionCode = '1'
21+
flutterVersionCode = "1"
1722
}
1823

19-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
24+
def flutterVersionName = localProperties.getProperty("flutter.versionName")
2025
if (flutterVersionName == null) {
21-
flutterVersionName = '1.0'
26+
flutterVersionName = "1.0"
2227
}
2328

24-
apply plugin: 'com.android.application'
25-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
26-
2729
android {
28-
namespace 'io.flutter.plugins.firebase.functions.example'
30+
namespace = "io.flutter.plugins.firebase.functions.example"
31+
compileSdk = flutter.compileSdkVersion
32+
ndkVersion = flutter.ndkVersion
2933

30-
compileSdk 34
31-
32-
defaultConfig {
33-
applicationId "io.flutter.plugins.firebase.functions.example"
34-
minSdkVersion 16
35-
targetSdkVersion 33
36-
versionCode flutterVersionCode.toInteger()
37-
versionName flutterVersionName
38-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
34+
compileOptions {
35+
sourceCompatibility = JavaVersion.VERSION_1_8
36+
targetCompatibility = JavaVersion.VERSION_1_8
3937
}
4038

41-
lint {
42-
disable 'InvalidPackage'
39+
defaultConfig {
40+
applicationId = "io.flutter.plugins.firebase.functions.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
4347
}
4448

4549
buildTypes {
4650
release {
4751
// TODO: Add your own signing config for the release build.
4852
// Signing with the debug keys for now, so `flutter run --release` works.
49-
signingConfig signingConfigs.debug
53+
signingConfig = signingConfigs.debug
5054
}
5155
}
5256
}
5357

5458
flutter {
55-
source '../..'
56-
}
57-
58-
dependencies {
59-
testImplementation 'junit:junit:4.12'
60-
androidTestImplementation 'androidx.test:runner:1.2.0'
61-
androidTestImplementation 'androidx.test:rules:1.2.0'
62-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
59+
source = "../.."
6360
}

packages/cloud_functions/cloud_functions/example/android/app/google-services.json

Lines changed: 75 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,58 @@
8686
}
8787
}
8888
},
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+
},
89141
{
90142
"client_info": {
91143
"mobilesdk_app_id": "1:406099696497:android:3ef965ff044efc0b3574d0",
@@ -248,9 +300,9 @@
248300
},
249301
{
250302
"client_info": {
251-
"mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0",
303+
"mobilesdk_app_id": "1:406099696497:android:6d1c1fbf4688f39c3574d0",
252304
"android_client_info": {
253-
"package_name": "io.flutter.plugins.firebase.messaging.example"
305+
"package_name": "io.flutter.plugins.firebase.installations.example"
254306
}
255307
},
256308
"oauth_client": [
@@ -284,9 +336,9 @@
284336
},
285337
{
286338
"client_info": {
287-
"mobilesdk_app_id": "1:406099696497:android:f54b85cfa36a39f73574d0",
339+
"mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0",
288340
"android_client_info": {
289-
"package_name": "io.flutter.plugins.firebase.remoteconfig.example"
341+
"package_name": "io.flutter.plugins.firebase.messaging.example"
290342
}
291343
},
292344
"oauth_client": [
@@ -320,9 +372,9 @@
320372
},
321373
{
322374
"client_info": {
323-
"mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0",
375+
"mobilesdk_app_id": "1:406099696497:android:f54b85cfa36a39f73574d0",
324376
"android_client_info": {
325-
"package_name": "io.flutter.plugins.firebase.tests"
377+
"package_name": "io.flutter.plugins.firebase.remoteconfig.example"
326378
}
327379
},
328380
"oauth_client": [
@@ -356,18 +408,26 @@
356408
},
357409
{
358410
"client_info": {
359-
"mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0",
411+
"mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0",
360412
"android_client_info": {
361-
"package_name": "io.flutter.plugins.firebase_ui_example"
413+
"package_name": "io.flutter.plugins.firebase.tests"
362414
}
363415
},
364416
"oauth_client": [
365417
{
366-
"client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com",
418+
"client_id": "406099696497-ib9hj9281l3343cm3nfvvdotaojrthdc.apps.googleusercontent.com",
367419
"client_type": 1,
368420
"android_info": {
369-
"package_name": "io.flutter.plugins.firebase_ui_example",
370-
"certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6"
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"
371431
}
372432
},
373433
{
@@ -400,17 +460,17 @@
400460
},
401461
{
402462
"client_info": {
403-
"mobilesdk_app_id": "1:406099696497:android:61e67dfd35ab93ad3574d0",
463+
"mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0",
404464
"android_client_info": {
405-
"package_name": "io.flutter.plugins.firebaseauthexample"
465+
"package_name": "io.flutter.plugins.firebase_ui_example"
406466
}
407467
},
408468
"oauth_client": [
409469
{
410-
"client_id": "406099696497-j20pm6c84pofkl1ivo4f7fe797smfnp4.apps.googleusercontent.com",
470+
"client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com",
411471
"client_type": 1,
412472
"android_info": {
413-
"package_name": "io.flutter.plugins.firebaseauthexample",
473+
"package_name": "io.flutter.plugins.firebase_ui_example",
414474
"certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6"
415475
}
416476
},

packages/cloud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
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
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>

0 commit comments

Comments
 (0)