diff --git a/packages/firebase_app_installations/firebase_app_installations/example/.metadata b/packages/firebase_app_installations/firebase_app_installations/example/.metadata index a5584fc372d9..65a4a371c766 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/.metadata +++ b/packages/firebase_app_installations/firebase_app_installations/example/.metadata @@ -4,7 +4,27 @@ # This file should be version controlled and should not be manually edited. version: - revision: 18116933e77adc82f80866c928266a5b4f1ed645 - 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_installations/firebase_app_installations/example/android/app/build.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle index 37b46e0dd177..9f51c811d222 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle @@ -1,71 +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' -apply plugin: 'kotlin-android' -apply plugin: 'com.google.gms.google-services' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - namespace 'io.flutter.plugins.firebase.installations.example' - - compileSdk 34 - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "io.flutter.plugins.firebase.installations.example" - minSdk 21 - targetSdk 33 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - } + namespace = "io.flutter.plugins.firebase.installations.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.installations.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 '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + source = "../.." } diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/google-services.json b/packages/firebase_app_installations/firebase_app_installations/example/android/app/google-services.json index f13186f775d6..6b7e04085d8b 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/google-services.json +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/google-services.json @@ -94,6 +94,22 @@ } }, "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 @@ -398,6 +414,22 @@ } }, "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 diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/debug/AndroidManifest.xml b/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 000000000000..399f6981d5d3 --- /dev/null +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/AndroidManifest.xml b/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/AndroidManifest.xml index 9fe579c74393..74a78b939e5e 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/AndroidManifest.xml +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/AndroidManifest.xml @@ -1,11 +1,13 @@ - + + + + + + + diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/installations/example/MainActivity.kt similarity index 72% rename from packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt rename to packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/installations/example/MainActivity.kt index 0e2f85cd7aee..6f76296229d1 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/installations/example/MainActivity.kt @@ -2,5 +2,4 @@ package io.flutter.plugins.firebase.installations.example import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { -} +class MainActivity: FlutterActivity() diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/res/values-night/styles.xml b/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/res/values-night/styles.xml index 449a9f930826..06952be745f9 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/res/values-night/styles.xml +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/src/main/res/values-night/styles.xml @@ -3,14 +3,14 @@