From e8cbcfba215e5ead0a9e9771e2bb4f3e3192fee1 Mon Sep 17 00:00:00 2001 From: Tarek Mohamed Abdalla Date: Mon, 3 Jun 2024 22:04:22 +0800 Subject: [PATCH] chore(firebase_analytics): upgrade gradle --- .../firebase_analytics/example/.metadata | 24 ++++- .../example/android/.gitignore | 13 +++ .../example/android/app/build.gradle | 54 +++++------ .../example/android/app/google-services.json | 90 +++++++++++++++--- .../android/app/src/debug/AndroidManifest.xml | 7 ++ .../android/app/src/main/AndroidManifest.xml | 59 ++++++++---- .../main/java/io/flutter/plugins/.gitignore | 3 - .../analytics/example/MainActivity.kt | 5 + .../res/drawable-v21/launch_background.xml | 12 +++ .../main/res/drawable/launch_background.xml | 12 +++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values-night/styles.xml | 18 ++++ .../app/src/main/res/values/styles.xml | 18 ++++ .../app/src/profile/AndroidManifest.xml | 7 ++ .../example/android/build.gradle | 4 +- .../example/android/gradle.properties | 6 +- .../example/android/settings.gradle | 9 +- 21 files changed, 267 insertions(+), 74 deletions(-) create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/.gitignore mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/app/google-services.json create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/debug/AndroidManifest.xml mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/AndroidManifest.xml delete mode 100755 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/java/io/flutter/plugins/.gitignore create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/analytics/example/MainActivity.kt create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/drawable/launch_background.xml mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/values-night/styles.xml create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/values/styles.xml create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/src/profile/AndroidManifest.xml mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/build.gradle mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/gradle.properties mode change 100755 => 100644 packages/firebase_analytics/firebase_analytics/example/android/settings.gradle diff --git a/packages/firebase_analytics/firebase_analytics/example/.metadata b/packages/firebase_analytics/firebase_analytics/example/.metadata index be0f63d80321..65a4a371c766 100644 --- a/packages/firebase_analytics/firebase_analytics/example/.metadata +++ b/packages/firebase_analytics/firebase_analytics/example/.metadata @@ -4,7 +4,27 @@ # This file should be version controlled and should not be manually edited. version: - revision: 4cc385b4b84ac2f816d939a49ea1f328c4e0b48e - 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_analytics/firebase_analytics/example/android/.gitignore b/packages/firebase_analytics/firebase_analytics/example/android/.gitignore new file mode 100644 index 000000000000..6f568019d3c6 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +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_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle old mode 100755 new mode 100644 index ee61d11ece02..d70102b2bf1f --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -1,60 +1,60 @@ plugins { id "com.android.application" - id "dev.flutter.flutter-gradle-plugin" + // 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 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.analytics.example' + namespace = "io.flutter.plugins.firebase.analytics.example" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion - compileSdk 34 - - defaultConfig { - applicationId "io.flutter.plugins.firebase.analytics.example" - minSdk 21 - targetSdk 33 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } - lintOptions { - disable 'InvalidPackage' + defaultConfig { + applicationId = "io.flutter.plugins.firebase.analytics.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 { - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + source = "../.." } diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/google-services.json b/packages/firebase_analytics/firebase_analytics/example/android/app/google-services.json old mode 100755 new mode 100644 index 5bc15c4a6b2f..6b7e04085d8b --- a/packages/firebase_analytics/firebase_analytics/example/android/app/google-services.json +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/google-services.json @@ -86,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", @@ -248,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": [ @@ -284,9 +336,9 @@ }, { "client_info": { - "mobilesdk_app_id": "1:406099696497:android:f54b85cfa36a39f73574d0", + "mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0", "android_client_info": { - "package_name": "io.flutter.plugins.firebase.remoteconfig.example" + "package_name": "io.flutter.plugins.firebase.messaging.example" } }, "oauth_client": [ @@ -320,9 +372,9 @@ }, { "client_info": { - "mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0", + "mobilesdk_app_id": "1:406099696497:android:f54b85cfa36a39f73574d0", "android_client_info": { - "package_name": "io.flutter.plugins.firebase.tests" + "package_name": "io.flutter.plugins.firebase.remoteconfig.example" } }, "oauth_client": [ @@ -356,18 +408,26 @@ }, { "client_info": { - "mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0", + "mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0", "android_client_info": { - "package_name": "io.flutter.plugins.firebase_ui_example" + "package_name": "io.flutter.plugins.firebase.tests" } }, "oauth_client": [ { - "client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com", + "client_id": "406099696497-ib9hj9281l3343cm3nfvvdotaojrthdc.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "io.flutter.plugins.firebase_ui_example", - "certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6" + "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" } }, { @@ -400,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/firebase_analytics/firebase_analytics/example/android/app/src/debug/AndroidManifest.xml b/packages/firebase_analytics/firebase_analytics/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 000000000000..399f6981d5d3 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/AndroidManifest.xml b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/AndroidManifest.xml old mode 100755 new mode 100644 index 0d52391a3aa3..74a78b939e5e --- a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/AndroidManifest.xml +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/AndroidManifest.xml @@ -1,22 +1,45 @@ - - - - - - - - - - + + + + + + + + - + + + + + + + + + diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/java/io/flutter/plugins/.gitignore b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/java/io/flutter/plugins/.gitignore deleted file mode 100755 index 0f2aeaa1dc2c..000000000000 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/java/io/flutter/plugins/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -GeneratedPluginRegistrant.java - - diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/analytics/example/MainActivity.kt b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/analytics/example/MainActivity.kt new file mode 100644 index 000000000000..807a758cd9cc --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/kotlin/io/flutter/plugins/firebase/analytics/example/MainActivity.kt @@ -0,0 +1,5 @@ +package io.flutter.plugins.firebase.analytics.example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 000000000000..f74085f3f6a2 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/drawable/launch_background.xml b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 000000000000..304732f88420 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/values-night/styles.xml b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 000000000000..06952be745f9 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/values/styles.xml b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/values/styles.xml new file mode 100644 index 000000000000..cb1ef88056ed --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/src/profile/AndroidManifest.xml b/packages/firebase_analytics/firebase_analytics/example/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 000000000000..399f6981d5d3 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle old mode 100755 new mode 100644 index bc157bd1a12b..d2ffbffa4cd2 --- a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/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/firebase_analytics/firebase_analytics/example/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties old mode 100755 new mode 100644 index aa8601e3000f..3b5b324f6e3f --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties +++ b/packages/firebase_analytics/firebase_analytics/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/firebase_analytics/firebase_analytics/example/android/settings.gradle b/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle old mode 100755 new mode 100644 index e84b2a845d90..7fb86d70412c --- a/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle @@ -18,8 +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.google.gms.google-services' version '4.4.1' 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 } -include ":app" \ No newline at end of file +include ":app"