diff --git a/packages/cloud_firestore/cloud_firestore/example/.metadata b/packages/cloud_firestore/cloud_firestore/example/.metadata index 5a023280af44..65a4a371c766 100644 --- a/packages/cloud_firestore/cloud_firestore/example/.metadata +++ b/packages/cloud_firestore/cloud_firestore/example/.metadata @@ -4,7 +4,27 @@ # This file should be version controlled and should not be manually edited. version: - revision: 7e9793dee1b85a243edd0e06cb1658e98b077561 - channel: stable + revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1" + channel: "stable" project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + - platform: android + create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle index d849949d9f60..aac86b0c93dd 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -1,66 +1,60 @@ plugins { id "com.android.application" + // START: FlutterFire Configuration + id 'com.google.gms.google-services' + // END: FlutterFire Configuration id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" - id "com.google.gms.google-services" } def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') +def localPropertiesFile = rootProject.file("local.properties") if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> + localPropertiesFile.withReader("UTF-8") { reader -> localProperties.load(reader) } } - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +def flutterVersionCode = localProperties.getProperty("flutter.versionCode") if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = "1" } -def flutterVersionName = localProperties.getProperty('flutter.versionName') +def flutterVersionName = localProperties.getProperty("flutter.versionName") if (flutterVersionName == null) { - flutterVersionName = '1.0' + flutterVersionName = "1.0" } - android { - namespace 'io.flutter.plugins.firebase.firestore.example' - - compileSdk 34 - - defaultConfig { - applicationId "io.flutter.plugins.firebase.firestore.example" - minSdk 21 - targetSdk 34 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - } + namespace = "io.flutter.plugins.firebase.firestore.example" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + defaultConfig { + applicationId = "io.flutter.plugins.firebase.firestore.example" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutterVersionCode.toInteger() + versionName = flutterVersionName } buildTypes { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } } flutter { - source '../..' + source = "../.." } - diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/google-services.json b/packages/cloud_firestore/cloud_firestore/example/android/app/google-services.json index 5f57f44207ec..6b7e04085d8b 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/google-services.json +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/google-services.json @@ -6,6 +6,42 @@ "storage_bucket": "flutterfire-e2e-tests.appspot.com" }, "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:406099696497:android:d86a91cc7b338b233574d0", + "android_client_info": { + "package_name": "io.flutter.plugins.firebase.analytics.example" + } + }, + "oauth_client": [ + { + "client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCdRjCVZlhrq72RuEklEyyxYlBRCYhI2Sw" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "io.flutter.plugins.firebase.example" + } + } + ] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:406099696497:android:a241c4b471513a203574d0", @@ -50,6 +86,58 @@ } } }, + { + "client_info": { + "mobilesdk_app_id": "1:406099696497:android:21d5142deea38dda3574d0", + "android_client_info": { + "package_name": "io.flutter.plugins.firebase.auth.example" + } + }, + "oauth_client": [ + { + "client_id": "406099696497-emmujnd7g2ammh5uu9ni6v04p4ateqac.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "io.flutter.plugins.firebase.auth.example", + "certificate_hash": "5ad0d6d5cbe577ca185b8df246656bebc3957128" + } + }, + { + "client_id": "406099696497-in8bfp0nali85oul1o98huoar6eo1vv1.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "io.flutter.plugins.firebase.auth.example", + "certificate_hash": "909ca1482ef022bbae45a2db6b6d05d807a4c4aa" + } + }, + { + "client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCdRjCVZlhrq72RuEklEyyxYlBRCYhI2Sw" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "io.flutter.plugins.firebase.example" + } + } + ] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:406099696497:android:3ef965ff044efc0b3574d0", @@ -212,9 +300,9 @@ }, { "client_info": { - "mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0", + "mobilesdk_app_id": "1:406099696497:android:6d1c1fbf4688f39c3574d0", "android_client_info": { - "package_name": "io.flutter.plugins.firebase.messaging.example" + "package_name": "io.flutter.plugins.firebase.installations.example" } }, "oauth_client": [ @@ -248,9 +336,9 @@ }, { "client_info": { - "mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0", + "mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0", "android_client_info": { - "package_name": "io.flutter.plugins.firebase.tests" + "package_name": "io.flutter.plugins.firebase.messaging.example" } }, "oauth_client": [ @@ -284,20 +372,12 @@ }, { "client_info": { - "mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0", + "mobilesdk_app_id": "1:406099696497:android:f54b85cfa36a39f73574d0", "android_client_info": { - "package_name": "io.flutter.plugins.firebase_ui_example" + "package_name": "io.flutter.plugins.firebase.remoteconfig.example" } }, "oauth_client": [ - { - "client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "io.flutter.plugins.firebase_ui_example", - "certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6" - } - }, { "client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com", "client_type": 3 @@ -328,12 +408,28 @@ }, { "client_info": { - "mobilesdk_app_id": "1:406099696497:android:b7a347ba65ca3b803574d0", + "mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0", "android_client_info": { - "package_name": "io.flutter.plugins.firebaseanalyticsexample" + "package_name": "io.flutter.plugins.firebase.tests" } }, "oauth_client": [ + { + "client_id": "406099696497-ib9hj9281l3343cm3nfvvdotaojrthdc.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "io.flutter.plugins.firebase.tests", + "certificate_hash": "5ad0d6d5cbe577ca185b8df246656bebc3957128" + } + }, + { + "client_id": "406099696497-lc54d5l8sp90k39r0bb39ovsgo1s9bek.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "io.flutter.plugins.firebase.tests", + "certificate_hash": "909ca1482ef022bbae45a2db6b6d05d807a4c4aa" + } + }, { "client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com", "client_type": 3 @@ -364,17 +460,17 @@ }, { "client_info": { - "mobilesdk_app_id": "1:406099696497:android:61e67dfd35ab93ad3574d0", + "mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0", "android_client_info": { - "package_name": "io.flutter.plugins.firebaseauthexample" + "package_name": "io.flutter.plugins.firebase_ui_example" } }, "oauth_client": [ { - "client_id": "406099696497-j20pm6c84pofkl1ivo4f7fe797smfnp4.apps.googleusercontent.com", + "client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "io.flutter.plugins.firebaseauthexample", + "package_name": "io.flutter.plugins.firebase_ui_example", "certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6" } }, diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/src/debug/AndroidManifest.xml b/packages/cloud_firestore/cloud_firestore/example/android/app/src/debug/AndroidManifest.xml index 9eb145498d6f..399f6981d5d3 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/AndroidManifest.xml b/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/AndroidManifest.xml index 3a11e7924f75..74a78b939e5e 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/AndroidManifest.xml +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - - + @@ -8,6 +7,7 @@ android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" + android:taskAffinity="" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" @@ -31,4 +31,15 @@ android:name="flutterEmbedding" android:value="2" /> + + + + + + + diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/firestore/example/MainActivity.kt b/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/firestore/example/MainActivity.kt index c824007942e9..47ab27f36c9a 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/firestore/example/MainActivity.kt +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/firestore/example/MainActivity.kt @@ -2,5 +2,4 @@ package io.flutter.plugins.firebase.firestore.example import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { -} +class MainActivity: FlutterActivity() diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/res/values-night/styles.xml b/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/res/values-night/styles.xml index 3db14bb5391f..06952be745f9 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/res/values-night/styles.xml +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/src/main/res/values-night/styles.xml @@ -3,7 +3,7 @@ diff --git a/packages/cloud_firestore/cloud_firestore/example/android/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/build.gradle index bc157bd1a12b..d2ffbffa4cd2 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/build.gradle @@ -5,12 +5,12 @@ allprojects { } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } tasks.register("clean", Delete) { diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties index aa8601e3000f..3b5b324f6e3f 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties +++ b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties @@ -1,5 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true -android.defaults.buildfeatures.buildconfig=true -android.nonTransitiveRClass=false -android.nonFinalResIds=false +android.enableJetifier=true diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties index db9a6b825d7f..d59564b345a5 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle b/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle index b53337d6d73d..7fb86d70412c 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle @@ -18,9 +18,11 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.2" apply false + id "com.android.application" version "7.3.0" apply false + // START: FlutterFire Configuration + id "com.google.gms.google-services" version "4.3.15" apply false + // END: FlutterFire Configuration id "org.jetbrains.kotlin.android" version "1.7.10" apply false - id "com.google.gms.google-services" version "4.4.0" apply false } include ":app" diff --git a/packages/cloud_firestore/cloud_firestore/example/firebase.json b/packages/cloud_firestore/cloud_firestore/example/firebase.json new file mode 100644 index 000000000000..a1cb0daa066a --- /dev/null +++ b/packages/cloud_firestore/cloud_firestore/example/firebase.json @@ -0,0 +1 @@ +{"flutter":{"platforms":{"android":{"default":{"projectId":"flutterfire-e2e-tests","appId":"1:406099696497:android:175ea7a64b2faf5e3574d0","fileOutput":"android/app/google-services.json"}}}}} \ No newline at end of file