diff --git a/packages/firebase_app_check/firebase_app_check/example/.metadata b/packages/firebase_app_check/firebase_app_check/example/.metadata
index be749857d059..65a4a371c766 100644
--- a/packages/firebase_app_check/firebase_app_check/example/.metadata
+++ b/packages/firebase_app_check/firebase_app_check/example/.metadata
@@ -4,7 +4,27 @@
# This file should be version controlled and should not be manually edited.
version:
- revision: adc687823a831bbebe28bdccfac1a628ca621513
- 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/firebase_app_check/firebase_app_check/example/android/.gitignore b/packages/firebase_app_check/firebase_app_check/example/android/.gitignore
index 0a741cb43d66..6f568019d3c6 100644
--- a/packages/firebase_app_check/firebase_app_check/example/android/.gitignore
+++ b/packages/firebase_app_check/firebase_app_check/example/android/.gitignore
@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
key.properties
+**/*.keystore
+**/*.jks
diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle
index c11309d2ded8..762ea98e4a9e 100644
--- a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle
+++ b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle
@@ -1,58 +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"
+}
+
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 flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-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"
}
-apply plugin: 'com.android.application'
-// START: FlutterFire Configuration
-apply plugin: 'com.google.gms.google-services'
-// END: FlutterFire Configuration
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
android {
- namespace "io.flutter.plugins.firebase.appcheck.example"
-
- compileSdk 34
+ namespace = "io.flutter.plugins.firebase.appcheck.example"
+ compileSdk = flutter.compileSdkVersion
+ ndkVersion = flutter.ndkVersion
- defaultConfig {
- applicationId "io.flutter.plugins.firebase.appcheck.example"
- minSdk 21
- targetSdk 33
- versionCode flutterVersionCode.toInteger()
- versionName flutterVersionName
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
}
- buildFeatures {
- buildConfig true
+ defaultConfig {
+ applicationId = "io.flutter.plugins.firebase.appcheck.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/firebase_app_check/firebase_app_check/example/android/app/google-services.json b/packages/firebase_app_check/firebase_app_check/example/android/app/google-services.json
index 13dc69de2fee..6b7e04085d8b 100644
--- a/packages/firebase_app_check/firebase_app_check/example/android/app/google-services.json
+++ b/packages/firebase_app_check/firebase_app_check/example/android/app/google-services.json
@@ -8,9 +8,9 @@
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:406099696497:android:e0752d466d8936243574d0",
+ "mobilesdk_app_id": "1:406099696497:android:d86a91cc7b338b233574d0",
"android_client_info": {
- "package_name": "com.example.testcliapp"
+ "package_name": "io.flutter.plugins.firebase.analytics.example"
}
},
"oauth_client": [
@@ -32,11 +32,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -77,11 +76,62 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "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"
}
}
]
@@ -114,11 +164,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -151,11 +200,46 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "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:175ea7a64b2faf5e3574d0",
+ "android_client_info": {
+ "package_name": "io.flutter.plugins.firebase.firestore.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.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -204,11 +288,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -217,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": [
@@ -241,11 +324,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -254,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": [
@@ -278,11 +360,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -291,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
@@ -323,11 +396,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -336,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
@@ -360,11 +448,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -373,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"
}
},
@@ -405,11 +492,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -442,11 +528,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -479,11 +564,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
@@ -516,11 +600,10 @@
"client_type": 3
},
{
- "client_id": "406099696497-17cfsesi620nhia0sck4map450gngkoh.apps.googleusercontent.com",
+ "client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "io.flutter.plugins.firebase.appcheck.example",
- "app_store_id": "123456"
+ "bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/src/debug/AndroidManifest.xml b/packages/firebase_app_check/firebase_app_check/example/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 000000000000..399f6981d5d3
--- /dev/null
+++ b/packages/firebase_app_check/firebase_app_check/example/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/AndroidManifest.xml b/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/AndroidManifest.xml
index 7854f1512090..74a78b939e5e 100644
--- a/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/AndroidManifest.xml
@@ -1,16 +1,17 @@
-
+ android:windowSoftInputMode="adjustResize">
+
+
+
+
+
+
diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/appcheck/example/MainActivity.kt b/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/appcheck/example/MainActivity.kt
new file mode 100644
index 000000000000..23c1224eea5c
--- /dev/null
+++ b/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/appcheck/example/MainActivity.kt
@@ -0,0 +1,5 @@
+package io.flutter.plugins.firebase.appcheck.example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()
diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/res/values-night/styles.xml b/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/res/values-night/styles.xml
index 449a9f930826..06952be745f9 100644
--- a/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/res/values-night/styles.xml
+++ b/packages/firebase_app_check/firebase_app_check/example/android/app/src/main/res/values-night/styles.xml
@@ -3,14 +3,14 @@