From 9699663375e2d290290fd90a27bdcbb0a53fc77c Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 11:30:44 +0200 Subject: [PATCH 01/18] Android-related updates --- .../cloud_firestore/android/build.gradle | 8 ++++++-- .../cloud_firestore/example/android/app/build.gradle | 6 +++--- .../cloud_firestore/example/android/build.gradle | 4 ++-- .../cloud_firestore/example/android/gradle.properties | 1 - .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/cloud_firestore/cloud_firestore/pubspec.yaml | 6 +++--- .../cloud_functions/android/build.gradle | 11 +++++++---- .../cloud_functions/example/android/app/build.gradle | 4 ++-- .../app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../cloud_functions/example/android/build.gradle | 6 +++--- .../cloud_functions/example/android/gradle.properties | 1 - .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/cloud_functions/cloud_functions/pubspec.yaml | 2 +- .../firebase_analytics/android/build.gradle | 9 ++++++--- .../firebase_analytics/android/gradle.properties | 3 +-- .../example/android/app/build.gradle | 4 ++-- .../app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_analytics/example/android/build.gradle | 4 +--- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_app_check/android/build.gradle | 7 +++++-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_app_check/example/android/build.gradle | 2 +- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_app_check/pubspec.yaml | 6 +++--- .../firebase_app_installations/android/build.gradle | 7 +++++-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 6 +++--- .../example/android/build.gradle | 4 ++-- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_app_installations/example/pubspec.yaml | 2 +- .../firebase_app_installations/pubspec.yaml | 4 ++-- .../firebase_auth/firebase_auth/android/build.gradle | 10 +++++++--- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_auth/example/android/app/build.gradle | 3 +++ .../firebase_auth/example/android/build.gradle | 4 ++-- .../firebase_auth/example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_auth/firebase_auth/example/pubspec.yaml | 4 ++-- packages/firebase_auth/firebase_auth/pubspec.yaml | 8 ++++---- .../firebase_core/firebase_core/android/build.gradle | 9 ++++++--- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_core/example/android/build.gradle | 6 +++--- .../firebase_core/example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/firebase_core/firebase_core/pubspec.yaml | 6 +++--- .../firebase_crashlytics/android/build.gradle | 9 ++++++--- .../example/android/app/build.gradle | 4 ++-- .../firebase_crashlytics/example/android/build.gradle | 8 ++++---- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_crashlytics/pubspec.yaml | 2 +- .../firebase_database/android/build.gradle | 9 ++++++--- .../example/android/app/build.gradle | 4 ++-- .../app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_database/example/android/build.gradle | 6 +++--- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_database/firebase_database/pubspec.yaml | 2 +- .../firebase_dynamic_links/android/build.gradle | 7 +++++-- .../example/android/app/build.gradle | 4 ++-- .../app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/build.gradle | 7 +++---- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_dynamic_links/example/pubspec.yaml | 2 +- .../firebase_dynamic_links/pubspec.yaml | 6 +++--- .../firebase_in_app_messaging/android/build.gradle | 9 ++++++--- .../android/gradle.properties | 1 - .../example/android/app/build.gradle | 4 ++-- .../example/android/build.gradle | 2 +- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_in_app_messaging/pubspec.yaml | 4 ++-- .../firebase_messaging/android/build.gradle | 9 ++++++--- .../example/android/app/build.gradle | 4 ++-- .../firebase_messaging/example/android/build.gradle | 6 +++--- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_messaging/example/pubspec.yaml | 6 +++--- .../firebase_messaging/pubspec.yaml | 8 ++++---- .../firebase_ml_model_downloader/android/build.gradle | 11 +++++++---- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 4 ++-- .../example/android/build.gradle | 2 +- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_ml_model_downloader/example/pubspec.yaml | 2 +- .../firebase_ml_model_downloader/pubspec.yaml | 4 ++-- .../firebase_performance/android/build.gradle | 9 ++++++--- .../example/android/app/build.gradle | 4 ++-- .../app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_performance/example/android/build.gradle | 4 +--- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_performance/example/pubspec.yaml | 4 ++-- .../firebase_performance/pubspec.yaml | 8 ++++---- .../firebase_remote_config/android/build.gradle | 9 ++++++--- .../example/android/app/build.gradle | 4 ++-- .../app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/build.gradle | 6 +++--- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_remote_config/pubspec.yaml | 6 +++--- .../firebase_storage/android/build.gradle | 9 ++++++--- .../firebase_storage/example/android/app/build.gradle | 4 ++-- .../app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_storage/example/android/build.gradle | 6 +++--- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_storage/example/pubspec.yaml | 4 ++-- .../firebase_storage/firebase_storage/pubspec.yaml | 6 +++--- .../firebase_ui_auth/example/android/app/build.gradle | 2 +- .../firebase_ui_auth/example/android/build.gradle | 4 ++-- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/firebase_ui_auth/pubspec.yaml | 6 +++--- .../example/android/app/build.gradle | 2 +- .../firebase_ui_database/example/android/build.gradle | 4 ++-- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/firebase_ui_database/example/pubspec.yaml | 6 +++--- packages/firebase_ui_database/pubspec.yaml | 4 ++-- .../example/android/app/build.gradle | 2 +- .../example/android/build.gradle | 4 ++-- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/firebase_ui_firestore/example/pubspec.yaml | 6 +++--- packages/firebase_ui_firestore/pubspec.yaml | 4 ++-- .../example/android/app/build.gradle | 2 +- .../example/android/build.gradle | 4 ++-- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_ui_localizations/example/pubspec.yaml | 4 ++-- packages/firebase_ui_localizations/pubspec.yaml | 4 ++-- .../example/android/app/build.gradle | 2 +- .../firebase_ui_oauth/example/android/build.gradle | 4 ++-- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/firebase_ui_oauth/pubspec.yaml | 6 +++--- packages/firebase_ui_oauth_apple/pubspec.yaml | 2 +- packages/firebase_ui_oauth_facebook/pubspec.yaml | 4 ++-- packages/firebase_ui_oauth_google/pubspec.yaml | 4 ++-- packages/firebase_ui_oauth_twitter/pubspec.yaml | 4 ++-- packages/firebase_ui_shared/pubspec.yaml | 2 +- .../example/android/app/build.gradle | 2 +- .../firebase_ui_storage/example/android/build.gradle | 4 ++-- .../example/android/gradle.properties | 3 +-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/firebase_ui_storage/pubspec.yaml | 8 ++++---- tests/android/app/build.gradle | 6 +++--- tests/android/build.gradle | 4 ++-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 156 files changed, 327 insertions(+), 303 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 526144adac7d..ca28cb3b92ec 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,7 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firestore' } - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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 43c48ee0cba8..ea4e6f715307 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -29,7 +29,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -47,7 +47,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.firestore.example" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -68,5 +68,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/cloud_firestore/cloud_firestore/example/android/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/build.gradle index ae605880881c..27fbf75fa445 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties index b9a9a2464056..b69a3d14f594 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties +++ b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false 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 da1db5f04e88..84a0b92f9af2 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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/cloud_firestore/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pubspec.yaml index e96f0d9db84f..a5e4aee7d37c 100755 --- a/packages/cloud_firestore/cloud_firestore/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pubspec.yaml @@ -17,17 +17,17 @@ environment: dependencies: cloud_firestore_platform_interface: ^5.15.3 cloud_firestore_web: ^3.6.3 - collection: ^1.0.0 + collection: ^1.17.2 firebase_core: ^2.15.0 firebase_core_platform_interface: ^4.8.0 flutter: sdk: flutter - meta: ^1.8.0 + meta: ^1.9.1 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.0 + mockito: ^5.4.2 flutter: plugin: diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index afd9a2296e53..24703990cc34 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.functions' } - - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +59,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-functions' - implementation 'androidx.annotation:annotation:1.0.0' + implementation 'androidx.annotation:annotation:1.6.0' } } diff --git a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle index 07515cba7ca2..e009ed1f0919 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.functions.example' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.functions.example" minSdkVersion 16 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/cloud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/cloud_functions/cloud_functions/example/android/build.gradle b/packages/cloud_functions/cloud_functions/example/android/build.gradle index fe9f643af12d..945da8369027 100644 --- a/packages/cloud_functions/cloud_functions/example/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/cloud_functions/cloud_functions/example/android/gradle.properties b/packages/cloud_functions/cloud_functions/example/android/gradle.properties index b9a9a2464056..b69a3d14f594 100644 --- a/packages/cloud_functions/cloud_functions/example/android/gradle.properties +++ b/packages/cloud_functions/cloud_functions/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false diff --git a/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_functions/cloud_functions/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/cloud_functions/cloud_functions/pubspec.yaml b/packages/cloud_functions/cloud_functions/pubspec.yaml index a600f1a711b6..71466365ba80 100644 --- a/packages/cloud_functions/cloud_functions/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - plugin_platform_interface: ^2.1.3 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index cb06892dd8ef..46716c0d6a6f 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.analytics' } - - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdkVersion 34 defaultConfig { minSdkVersion 19 diff --git a/packages/firebase_analytics/firebase_analytics/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100755 --- a/packages/firebase_analytics/firebase_analytics/android/gradle.properties +++ b/packages/firebase_analytics/firebase_analytics/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle index a3b4f9e3ebfa..2ed02213f3db 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services' android { namespace 'io.flutter.plugins.firebase.analytics.example' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -36,7 +36,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.analytics.example" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties index 0ebb3108e207..84a0b92f9af2 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle index 0cdd38a12388..87672991fe50 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle @@ -1,12 +1,11 @@ buildscript { repositories { google() - jcenter() mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -14,7 +13,6 @@ buildscript { allprojects { repositories { google() - jcenter() mavenLocal() } } diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties +++ b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_analytics/firebase_analytics/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle index 5128490ce517..b23e8bd402ab 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.appcheck' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_check/firebase_app_check/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 790ae215ef31..9dd2bd7c1566 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 @@ -29,12 +29,12 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "io.flutter.plugins.firebase.appcheck.example" - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "io.flutter.plugins.firebase.appcheck.example" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_app_check/firebase_app_check/example/android/build.gradle b/packages/firebase_app_check/firebase_app_check/example/android/build.gradle index 7f7248c01af5..fd810ff849b7 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties b/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties +++ b/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_check/firebase_app_check/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_app_check/firebase_app_check/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/pubspec.yaml index 3c2e0d1ab501..8f4545c62340 100644 --- a/packages/firebase_app_check/firebase_app_check/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/pubspec.yaml @@ -20,11 +20,11 @@ dependencies: sdk: flutter dev_dependencies: - async: ^2.5.0 + async: ^2.11.0 flutter_test: sdk: flutter - mockito: ^5.0.0 - plugin_platform_interface: ^2.1.3 + mockito: ^5.4.2 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index f8cae1bb2d3f..41b2a0c1dc1b 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -59,7 +62,7 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_installations/firebase_app_installations/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 4bdaa47d1de5..28a28d9963ba 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 @@ -28,7 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.installations.example' - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -47,7 +47,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.flutter.plugins.firebase.installations.example" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -66,5 +66,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle index 913279681350..e05d8e99bbfc 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.15' } diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_installations/firebase_app_installations/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml index 36f2c1123b2d..a9ec336767e7 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: sdk: flutter dev_dependencies: - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.2 flutter: uses-material-design: true diff --git a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml index d219631fed07..ca03285e55e3 100644 --- a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml @@ -23,8 +23,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.16 - plugin_platform_interface: ^2.1.3 + mockito: ^5.4.2 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 0ecef8a5cd7b..4b51605d4b3a 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,7 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.auth' } - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -55,7 +59,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-auth' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } } diff --git a/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_auth/firebase_auth/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index c79b6689ab88..a594e005038c 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -30,6 +30,9 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebaseauthexample' } + buildFeatures { + buildConfig = true + } compileSdkVersion flutter.compileSdkVersion diff --git a/packages/firebase_auth/firebase_auth/example/android/build.gradle b/packages/firebase_auth/firebase_auth/example/android/build.gradle index 2f98383dddd5..491d92df4d18 100644 --- a/packages/firebase_auth/firebase_auth/example/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/packages/firebase_auth/firebase_auth/example/android/gradle.properties b/packages/firebase_auth/firebase_auth/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_auth/firebase_auth/example/android/gradle.properties +++ b/packages/firebase_auth/firebase_auth/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_auth/firebase_auth/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_auth/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/firebase_auth/example/pubspec.yaml index 35be268c7670..4ddd5f2d880a 100644 --- a/packages/firebase_auth/firebase_auth/example/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/example/pubspec.yaml @@ -11,10 +11,10 @@ dependencies: flutter: sdk: flutter flutter_signin_button: ^2.0.0 - google_sign_in: ^6.1.0 + google_sign_in: ^6.1.4 dev_dependencies: - http: ^0.13.3 + http: ^1.1.0 flutter: uses-material-design: true diff --git a/packages/firebase_auth/firebase_auth/pubspec.yaml b/packages/firebase_auth/firebase_auth/pubspec.yaml index 6ebdd51b75c5..625a626e996a 100755 --- a/packages/firebase_auth/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/pubspec.yaml @@ -20,14 +20,14 @@ dependencies: firebase_core_platform_interface: ^4.8.0 flutter: sdk: flutter - meta: ^1.8.0 + meta: ^1.9.1 dev_dependencies: - async: ^2.5.0 + async: ^2.11.0 flutter_test: sdk: flutter - mockito: ^5.0.0 - plugin_platform_interface: ^2.1.3 + mockito: ^5.4.2 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 259430a96d1a..42141877b33a 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -25,8 +25,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.core' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 defaultConfig { minSdkVersion 16 @@ -43,7 +46,7 @@ android { implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrDefaultProperty("FirebaseSDKVersion")}") implementation "com.google.firebase:firebase-common" - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } } diff --git a/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_core/firebase_core/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_core/firebase_core/example/android/build.gradle b/packages/firebase_core/firebase_core/example/android/build.gradle index 8237b734dca2..a3b34c3b478a 100644 --- a/packages/firebase_core/firebase_core/example/android/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/build.gradle @@ -1,18 +1,18 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' } } allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_core/firebase_core/example/android/gradle.properties b/packages/firebase_core/firebase_core/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_core/firebase_core/example/android/gradle.properties +++ b/packages/firebase_core/firebase_core/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_core/firebase_core/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index a0c57dfa7bda..a365b7f66986 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -17,13 +17,13 @@ dependencies: firebase_core_web: ^2.6.0 flutter: sdk: flutter - meta: ^1.8.0 + meta: ^1.9.1 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.0 - plugin_platform_interface: ^2.1.3 + mockito: ^5.4.2 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index e9f6a6cb5744..74eb9bde1d91 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -38,8 +38,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.crashlytics' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -57,7 +60,7 @@ android { dependencies { implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-crashlytics' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle index 3d45cb6c164a..fb8a62364a21 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecrashlyticsexample' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId 'io.flutter.plugins.firebasecrashlyticsexample' minSdkVersion 19 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle index e3aa19badb73..6af814ec9694 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle @@ -1,20 +1,20 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7' } } allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_crashlytics/firebase_crashlytics/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml index 3c07f0cc687f..6ce561ecdd00 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: firebase_crashlytics_platform_interface: ^3.6.4 flutter: sdk: flutter - stack_trace: ^1.10.0 + stack_trace: ^1.11.1 dev_dependencies: flutter_test: diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index e2933d30e1cd..7a5c283e4cf2 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.database' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 defaultConfig { minSdkVersion 19 @@ -53,7 +56,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-database' - implementation 'androidx.annotation:annotation:1.3.0' + implementation 'androidx.annotation:annotation:1.6.0' } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_database/firebase_database/example/android/app/build.gradle b/packages/firebase_database/firebase_database/example/android/app/build.gradle index 12f502b90546..d67c96195672 100755 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.database.example' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId 'io.flutter.plugins.firebase.database.example' minSdkVersion 19 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_database/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_database/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_database/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_database/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_database/firebase_database/example/android/build.gradle b/packages/firebase_database/firebase_database/example/android/build.gradle index fe9f643af12d..945da8369027 100755 --- a/packages/firebase_database/firebase_database/example/android/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_database/firebase_database/example/android/gradle.properties b/packages/firebase_database/firebase_database/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100755 --- a/packages/firebase_database/firebase_database/example/android/gradle.properties +++ b/packages/firebase_database/firebase_database/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_database/firebase_database/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_database/firebase_database/pubspec.yaml b/packages/firebase_database/firebase_database/pubspec.yaml index 86df3b93d11c..2fff375e6a52 100755 --- a/packages/firebase_database/firebase_database/pubspec.yaml +++ b/packages/firebase_database/firebase_database/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.2 + mockito: ^5.4.2 flutter: plugin: diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index 2e4922e33113..bbb4b0953a36 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.dynamiclinks' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle index 78a67ad9d563..8d84a368e637 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.dynamiclinksexample' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.dynamiclinksexample" minSdkVersion 19 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/build.gradle index 735309b337c1..945da8369027 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,8 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() - mavenLocal() + mavenCentral() } } diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/pubspec.yaml b/packages/firebase_dynamic_links/firebase_dynamic_links/example/pubspec.yaml index bb142778e191..51d339ba63f1 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/pubspec.yaml +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: firebase_dynamic_links: ^5.3.4 flutter: sdk: flutter - url_launcher: ^6.1.10 + url_launcher: ^6.1.12 flutter: uses-material-design: true diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/firebase_dynamic_links/pubspec.yaml index a6a407c17ae4..48e46773079c 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/pubspec.yaml +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/pubspec.yaml @@ -19,13 +19,13 @@ dependencies: firebase_dynamic_links_platform_interface: ^0.2.6+4 flutter: sdk: flutter - meta: ^1.8.0 - plugin_platform_interface: ^2.1.3 + meta: ^1.9.1 + plugin_platform_interface: ^2.1.4 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.0 + mockito: ^5.4.2 flutter: plugin: diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index 2e114b11cecf..af141ebef4ae 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.inappmessaging' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +59,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-inappmessaging-display' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } } diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/gradle.properties b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/gradle.properties index 1441b1da923a..7be3d8b46841 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/gradle.properties +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx1536M - android.enableR8=true diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle index 7017f7770656..059d17d1ff6e 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/build.gradle index 7dfa17343bdd..945da8369027 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml index c941575aa974..42fba280e6a2 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml @@ -17,12 +17,12 @@ dependencies: firebase_in_app_messaging_platform_interface: ^0.2.4+4 flutter: sdk: flutter - meta: ^1.8.0 + meta: ^1.9.1 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.16 + mockito: ^5.4.2 plugin_platform_interface: null flutter: diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index 52307b8a51a6..abd87ade62e1 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.messaging' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -57,7 +60,7 @@ android { implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-messaging' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' - implementation 'androidx.annotation:annotation:1.4.0' + implementation 'androidx.annotation:annotation:1.6.0' implementation ('com.google.firebase:firebase-iid:21.1.0') { transitive = true } diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle index 96fb245e2cdd..39b882fa462c 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.messaging.example' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.messaging.example" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_messaging/firebase_messaging/example/android/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/build.gradle index f51ab63f5983..04a966bd5ef5 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties b/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties +++ b/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_messaging/firebase_messaging/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml index 2dcce03f8ba6..92ce71447afc 100644 --- a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml @@ -10,12 +10,12 @@ dependencies: firebase_messaging: ^14.6.5 flutter: sdk: flutter - flutter_local_notifications: ^14.0.0+1 - http: ^0.13.0 + flutter_local_notifications: ^15.1.0+1 + http: ^1.1.0 dependency_overrides: # Override for `flutter_local_notifications`: - plugin_platform_interface: ^2.1.3 + plugin_platform_interface: ^2.1.4 flutter: uses-material-design: true diff --git a/packages/firebase_messaging/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/pubspec.yaml index f18d33e47e1c..bf292f25a859 100644 --- a/packages/firebase_messaging/firebase_messaging/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/pubspec.yaml @@ -19,14 +19,14 @@ dependencies: firebase_messaging_web: ^3.5.4 flutter: sdk: flutter - meta: ^1.8.0 + meta: ^1.9.1 dev_dependencies: - async: ^2.5.0 + async: ^2.11.0 flutter_test: sdk: flutter - mockito: ^5.0.0 - plugin_platform_interface: ^2.1.3 + mockito: ^5.4.2 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index 5a7e1e3f8550..3b3ab9f00dad 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firebase_ml_model_downloader' } - - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +59,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-ml-modeldownloader' - implementation 'androidx.annotation:annotation:1.3.0' + implementation 'androidx.annotation:annotation:1.6.0' } } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle index f583097273a0..0fd56c22e38f 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle @@ -29,7 +29,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -39,7 +39,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/build.gradle index 927bcf02b688..171a56be03ae 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml index c0d700cc560c..d94a941bc399 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: firebase_ml_model_downloader: ^0.2.3+4 dev_dependencies: - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.2 flutter: uses-material-design: true diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml index 4f5fe19b3c9b..746d97a8707c 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml @@ -21,8 +21,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.0 - plugin_platform_interface: ^2.1.3 + mockito: ^5.4.2 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 69adadc53e7d..423fcc15ffee 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.performance' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 defaultConfig { minSdkVersion 16 @@ -53,7 +56,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-perf' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle index c83aba7fac88..7c4e3e0d15a0 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -36,7 +36,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_performance/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_performance/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_performance/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_performance/firebase_performance/example/android/build.gradle b/packages/firebase_performance/firebase_performance/example/android/build.gradle index 71cd3d5001b3..50502a530780 100644 --- a/packages/firebase_performance/firebase_performance/example/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/build.gradle @@ -1,12 +1,11 @@ buildscript { repositories { google() - jcenter() mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.firebase:perf-plugin:1.4.2' } @@ -15,7 +14,6 @@ buildscript { allprojects { repositories { google() - jcenter() mavenLocal() } } diff --git a/packages/firebase_performance/firebase_performance/example/android/gradle.properties b/packages/firebase_performance/firebase_performance/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_performance/firebase_performance/example/android/gradle.properties +++ b/packages/firebase_performance/firebase_performance/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_performance/firebase_performance/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_performance/firebase_performance/example/pubspec.yaml b/packages/firebase_performance/firebase_performance/example/pubspec.yaml index 8d4c584d8634..f44bce7ca091 100644 --- a/packages/firebase_performance/firebase_performance/example/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/example/pubspec.yaml @@ -11,14 +11,14 @@ dependencies: firebase_performance: ^0.9.2+4 flutter: sdk: flutter - http: ^0.13.0 + http: ^1.1.0 dev_dependencies: flutter_test: sdk: flutter integration_test: sdk: flutter - pedantic: ^1.8.0 + pedantic: ^1.11.1 flutter: uses-material-design: true diff --git a/packages/firebase_performance/firebase_performance/pubspec.yaml b/packages/firebase_performance/firebase_performance/pubspec.yaml index 882f390b2ee9..42937ac44fe3 100644 --- a/packages/firebase_performance/firebase_performance/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/pubspec.yaml @@ -25,10 +25,10 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - http: ^0.13.0 - mockito: ^5.0.0 - pedantic: ^1.8.0 - plugin_platform_interface: ^2.1.3 + http: ^1.1.0 + mockito: ^5.4.2 + pedantic: ^1.11.1 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle index 0fd936a88113..d389c232ea2c 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firebaseremoteconfig' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +59,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-config' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } } diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle index fe5fd2f8e517..8886e9604c45 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.remoteconfig.example' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.remoteconfig.example" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_remote_config/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/build.gradle index fe9f643af12d..945da8369027 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_remote_config/firebase_remote_config/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml index e77ad53a12a7..7e59fc385ce0 100644 --- a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml @@ -24,9 +24,9 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.0 - pedantic: ^1.8.0 - plugin_platform_interface: ^2.1.3 + mockito: ^5.4.2 + pedantic: ^1.11.1 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 0fe207601d46..bdf7fec220d9 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.0.2' } } @@ -47,8 +47,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.storage' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -64,7 +67,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-storage' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } } diff --git a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle index 12865218052f..74ca2b2c875c 100755 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasestorageexample' - compileSdkVersion 33 + compileSdkVersion 34 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId 'io.flutter.plugins.firebasestorageexample' minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_storage/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_storage/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_storage/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_storage/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_storage/firebase_storage/example/android/build.gradle b/packages/firebase_storage/firebase_storage/example/android/build.gradle index 05226cc38ae5..945da8369027 100755 --- a/packages/firebase_storage/firebase_storage/example/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_storage/firebase_storage/example/android/gradle.properties b/packages/firebase_storage/firebase_storage/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100755 --- a/packages/firebase_storage/firebase_storage/example/android/gradle.properties +++ b/packages/firebase_storage/firebase_storage/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_storage/firebase_storage/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_storage/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/firebase_storage/example/pubspec.yaml index 86c7debcc496..696669d1185a 100755 --- a/packages/firebase_storage/firebase_storage/example/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/example/pubspec.yaml @@ -9,8 +9,8 @@ dependencies: firebase_storage: ^11.2.5 flutter: sdk: flutter - image_picker: ^0.8.7+4 - image_picker_for_web: ^2.1.12 + image_picker: ^1.0.1 + image_picker_for_web: ^2.2.0 flutter: uses-material-design: true diff --git a/packages/firebase_storage/firebase_storage/pubspec.yaml b/packages/firebase_storage/firebase_storage/pubspec.yaml index 50a6d4230bef..5001044a7774 100755 --- a/packages/firebase_storage/firebase_storage/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/pubspec.yaml @@ -23,9 +23,9 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - http: ^0.13.0 - mockito: ^5.0.0 - plugin_platform_interface: ^2.1.3 + http: ^1.1.0 + mockito: ^5.4.2 + plugin_platform_interface: ^2.1.4 flutter: plugin: diff --git a/packages/firebase_ui_auth/example/android/app/build.gradle b/packages/firebase_ui_auth/example/android/app/build.gradle index 052a91890330..3ff3fc3d5148 100644 --- a/packages/firebase_ui_auth/example/android/app/build.gradle +++ b/packages/firebase_ui_auth/example/android/app/build.gradle @@ -65,5 +65,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_auth/example/android/build.gradle b/packages/firebase_ui_auth/example/android/build.gradle index cadf1cf06ca4..0efbaa6624a6 100644 --- a/packages/firebase_ui_auth/example/android/build.gradle +++ b/packages/firebase_ui_auth/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/firebase_ui_auth/example/android/gradle.properties b/packages/firebase_ui_auth/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_auth/example/android/gradle.properties +++ b/packages/firebase_ui_auth/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ui_auth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_auth/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_auth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_auth/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_auth/pubspec.yaml b/packages/firebase_ui_auth/pubspec.yaml index ff914abaacbb..366d83550a3e 100644 --- a/packages/firebase_ui_auth/pubspec.yaml +++ b/packages/firebase_ui_auth/pubspec.yaml @@ -9,7 +9,7 @@ environment: flutter: '>=3.3.0' dependencies: - email_validator: ^2.0.1 + email_validator: ^2.1.17 firebase_auth: ^4.7.1 firebase_core: ^2.15.0 firebase_dynamic_links: ^5.3.4 @@ -24,8 +24,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 - mockito: ^5.4.0 + flutter_lints: ^2.0.2 + mockito: ^5.4.2 false_secrets: - '/example/**/google-services.json' diff --git a/packages/firebase_ui_database/example/android/app/build.gradle b/packages/firebase_ui_database/example/android/app/build.gradle index af854b63eee5..211a0556b8d7 100644 --- a/packages/firebase_ui_database/example/android/app/build.gradle +++ b/packages/firebase_ui_database/example/android/app/build.gradle @@ -68,5 +68,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_database/example/android/build.gradle b/packages/firebase_ui_database/example/android/build.gradle index e5969960677d..12865fc59627 100644 --- a/packages/firebase_ui_database/example/android/build.gradle +++ b/packages/firebase_ui_database/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_ui_database/example/android/gradle.properties b/packages/firebase_ui_database/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_database/example/android/gradle.properties +++ b/packages/firebase_ui_database/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ui_database/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_database/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_database/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_database/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_database/example/pubspec.yaml b/packages/firebase_ui_database/example/pubspec.yaml index 5c8c460d7e25..6667662bb879 100644 --- a/packages/firebase_ui_database/example/pubspec.yaml +++ b/packages/firebase_ui_database/example/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: firebase_ui_database: ^1.3.4 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 + cupertino_icons: ^1.0.5 firebase_core: ^2.15.0 firebase_database: ^10.2.4 dev_dependencies: @@ -41,14 +41,14 @@ dev_dependencies: sdk: flutter integration_test: sdk: flutter - mockito: ^5.3.0 + mockito: ^5.4.2 # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_database/pubspec.yaml b/packages/firebase_ui_database/pubspec.yaml index cd528acac194..f2131b2e8616 100644 --- a/packages/firebase_ui_database/pubspec.yaml +++ b/packages/firebase_ui_database/pubspec.yaml @@ -8,7 +8,7 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.16.0 + collection: ^1.17.2 firebase_database: ^10.2.4 firebase_ui_localizations: ^1.5.0 flutter: @@ -17,7 +17,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_firestore/example/android/app/build.gradle b/packages/firebase_ui_firestore/example/android/app/build.gradle index af854b63eee5..211a0556b8d7 100644 --- a/packages/firebase_ui_firestore/example/android/app/build.gradle +++ b/packages/firebase_ui_firestore/example/android/app/build.gradle @@ -68,5 +68,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_firestore/example/android/build.gradle b/packages/firebase_ui_firestore/example/android/build.gradle index e5969960677d..12865fc59627 100644 --- a/packages/firebase_ui_firestore/example/android/build.gradle +++ b/packages/firebase_ui_firestore/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_ui_firestore/example/android/gradle.properties b/packages/firebase_ui_firestore/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_firestore/example/android/gradle.properties +++ b/packages/firebase_ui_firestore/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ui_firestore/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_firestore/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_firestore/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_firestore/example/pubspec.yaml b/packages/firebase_ui_firestore/example/pubspec.yaml index 7538b279f77c..27691ff5ab46 100644 --- a/packages/firebase_ui_firestore/example/pubspec.yaml +++ b/packages/firebase_ui_firestore/example/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: sdk: flutter firebase_ui_firestore: ^1.5.5 cloud_firestore: ^4.8.3 - cupertino_icons: ^1.0.2 + cupertino_icons: ^1.0.5 firebase_core: ^2.15.0 dev_dependencies: drive: ^1.0.0-1.0.nullsafety.1 @@ -39,14 +39,14 @@ dev_dependencies: sdk: flutter integration_test: sdk: flutter - mockito: ^5.3.0 + mockito: ^5.4.2 # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_firestore/pubspec.yaml b/packages/firebase_ui_firestore/pubspec.yaml index 8280f7a188ac..536e3cfbfa5a 100644 --- a/packages/firebase_ui_firestore/pubspec.yaml +++ b/packages/firebase_ui_firestore/pubspec.yaml @@ -16,8 +16,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 - mockito: ^5.3.0 + flutter_lints: ^2.0.2 + mockito: ^5.4.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_localizations/example/android/app/build.gradle b/packages/firebase_ui_localizations/example/android/app/build.gradle index cc2e3f3e9558..0531088dfa35 100644 --- a/packages/firebase_ui_localizations/example/android/app/build.gradle +++ b/packages/firebase_ui_localizations/example/android/app/build.gradle @@ -65,5 +65,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_localizations/example/android/build.gradle b/packages/firebase_ui_localizations/example/android/build.gradle index 4eb693a2dc3e..0efbaa6624a6 100644 --- a/packages/firebase_ui_localizations/example/android/build.gradle +++ b/packages/firebase_ui_localizations/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/firebase_ui_localizations/example/android/gradle.properties b/packages/firebase_ui_localizations/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_localizations/example/android/gradle.properties +++ b/packages/firebase_ui_localizations/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ui_localizations/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_localizations/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_localizations/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_localizations/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_localizations/example/pubspec.yaml b/packages/firebase_ui_localizations/example/pubspec.yaml index f3f2a5290e9f..8793a1ac8a4a 100644 --- a/packages/firebase_ui_localizations/example/pubspec.yaml +++ b/packages/firebase_ui_localizations/example/pubspec.yaml @@ -29,7 +29,7 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - cupertino_icons: ^1.0.2 + cupertino_icons: ^1.0.5 firebase_core: ^2.15.0 firebase_ui_auth: ^1.6.1 @@ -40,7 +40,7 @@ dependencies: sdk: flutter dev_dependencies: - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 flutter_test: sdk: flutter diff --git a/packages/firebase_ui_localizations/pubspec.yaml b/packages/firebase_ui_localizations/pubspec.yaml index 164a5b041e93..7d0d20731184 100644 --- a/packages/firebase_ui_localizations/pubspec.yaml +++ b/packages/firebase_ui_localizations/pubspec.yaml @@ -15,12 +15,12 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - path: ^1.8.2 + path: ^1.8.3 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_oauth/example/android/app/build.gradle b/packages/firebase_ui_oauth/example/android/app/build.gradle index 5bfe5bf1e748..b6612c60e5ad 100644 --- a/packages/firebase_ui_oauth/example/android/app/build.gradle +++ b/packages/firebase_ui_oauth/example/android/app/build.gradle @@ -68,5 +68,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_oauth/example/android/build.gradle b/packages/firebase_ui_oauth/example/android/build.gradle index 0d1b7eed9d19..12865fc59627 100644 --- a/packages/firebase_ui_oauth/example/android/build.gradle +++ b/packages/firebase_ui_oauth/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_ui_oauth/example/android/gradle.properties b/packages/firebase_ui_oauth/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_oauth/example/android/gradle.properties +++ b/packages/firebase_ui_oauth/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ui_oauth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_oauth/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_oauth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_oauth/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_oauth/pubspec.yaml b/packages/firebase_ui_oauth/pubspec.yaml index adedbf524b02..b8a371ed7934 100644 --- a/packages/firebase_ui_oauth/pubspec.yaml +++ b/packages/firebase_ui_oauth/pubspec.yaml @@ -8,18 +8,18 @@ environment: flutter: '>=3.3.0' dependencies: - desktop_webview_auth: ^0.0.11 + desktop_webview_auth: ^0.0.13 firebase_auth: ^4.7.1 firebase_ui_auth: ^1.6.1 firebase_ui_shared: ^1.3.0 - flutter_svg: ^2.0.5 + flutter_svg: ^2.0.7 flutter: sdk: flutter dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 false_secrets: - '/example/**/google-services.json' diff --git a/packages/firebase_ui_oauth_apple/pubspec.yaml b/packages/firebase_ui_oauth_apple/pubspec.yaml index 94badc6ca190..78de348c1425 100644 --- a/packages/firebase_ui_oauth_apple/pubspec.yaml +++ b/packages/firebase_ui_oauth_apple/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_oauth_facebook/pubspec.yaml b/packages/firebase_ui_oauth_facebook/pubspec.yaml index 22d5bd3188fb..b2d50eab0941 100644 --- a/packages/firebase_ui_oauth_facebook/pubspec.yaml +++ b/packages/firebase_ui_oauth_facebook/pubspec.yaml @@ -12,12 +12,12 @@ dependencies: firebase_ui_oauth: ^1.4.6 flutter: sdk: flutter - flutter_facebook_auth: ^5.0.8 + flutter_facebook_auth: ^5.0.11 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_oauth_google/pubspec.yaml b/packages/firebase_ui_oauth_google/pubspec.yaml index 07177fabb538..7bf99c2b4277 100644 --- a/packages/firebase_ui_oauth_google/pubspec.yaml +++ b/packages/firebase_ui_oauth_google/pubspec.yaml @@ -12,12 +12,12 @@ dependencies: firebase_ui_oauth: ^1.4.6 flutter: sdk: flutter - google_sign_in: ^6.1.0 + google_sign_in: ^6.1.4 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 false_secrets: - '/example/**/google-services.json' diff --git a/packages/firebase_ui_oauth_twitter/pubspec.yaml b/packages/firebase_ui_oauth_twitter/pubspec.yaml index 1384e9291f7b..24b34b89b5ab 100644 --- a/packages/firebase_ui_oauth_twitter/pubspec.yaml +++ b/packages/firebase_ui_oauth_twitter/pubspec.yaml @@ -12,12 +12,12 @@ dependencies: sdk: flutter firebase_auth: ^4.7.1 firebase_ui_oauth: ^1.4.6 - twitter_login: ^4.3.2 + twitter_login: ^4.4.1 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_shared/pubspec.yaml b/packages/firebase_ui_shared/pubspec.yaml index 18120aa69530..72f52201b359 100644 --- a/packages/firebase_ui_shared/pubspec.yaml +++ b/packages/firebase_ui_shared/pubspec.yaml @@ -14,6 +14,6 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^2.0.2 flutter: diff --git a/packages/firebase_ui_storage/example/android/app/build.gradle b/packages/firebase_ui_storage/example/android/app/build.gradle index f7c4c0f863f6..7efd45136c6e 100644 --- a/packages/firebase_ui_storage/example/android/app/build.gradle +++ b/packages/firebase_ui_storage/example/android/app/build.gradle @@ -65,5 +65,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_storage/example/android/build.gradle b/packages/firebase_ui_storage/example/android/build.gradle index ce647a433bd0..d214c9eed427 100644 --- a/packages/firebase_ui_storage/example/android/build.gradle +++ b/packages/firebase_ui_storage/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/firebase_ui_storage/example/android/gradle.properties b/packages/firebase_ui_storage/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_storage/example/android/gradle.properties +++ b/packages/firebase_ui_storage/example/android/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ui_storage/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_storage/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_storage/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_storage/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_storage/pubspec.yaml b/packages/firebase_ui_storage/pubspec.yaml index 0694c47edce4..d717dcc155fa 100644 --- a/packages/firebase_ui_storage/pubspec.yaml +++ b/packages/firebase_ui_storage/pubspec.yaml @@ -15,15 +15,15 @@ dependencies: sdk: flutter firebase_storage: ^11.2.5 firebase_ui_shared: ^1.3.0 - path: ^1.8.2 + path: ^1.8.3 uuid: ^3.0.7 - file_selector: ^0.9.2+4 + file_selector: ^1.0.0 flutter_blurhash: ^0.7.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 - mockito: ^5.3.2 + flutter_lints: ^2.0.2 + mockito: ^5.4.2 flutter: diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index a708dc21a8bd..79b1e39f14b7 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -29,7 +29,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -48,7 +48,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.flutter.plugins.firebase.tests" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -67,5 +67,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/tests/android/build.gradle b/tests/android/build.gradle index 5aaf6b10f869..29178d15aa0d 100644 --- a/tests/android/build.gradle +++ b/tests/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.firebase:perf-plugin:1.4.2' diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From a7d034a0cd499b30905e63df1b740075ffc28d78 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 11:55:11 +0200 Subject: [PATCH 02/18] Update versions --- packages/_flutterfire_internals/pubspec.yaml | 6 +++--- packages/cloud_firestore/cloud_firestore/pubspec.yaml | 2 +- .../cloud_firestore_platform_interface/pubspec.yaml | 8 ++++---- .../cloud_firestore/cloud_firestore_web/pubspec.yaml | 6 +++--- .../cloud_firestore_odm_generator/pubspec.yaml | 2 +- .../firebase_auth_platform_interface/pubspec.yaml | 10 +++++----- .../firebase_core_platform_interface/pubspec.yaml | 10 +++++----- .../pubspec.yaml | 8 ++++---- .../firebase_database_platform_interface/pubspec.yaml | 8 ++++---- .../firebase_storage_platform_interface/pubspec.yaml | 8 ++++---- packages/firebase_ui_database/pubspec.yaml | 2 +- tests/pubspec.yaml | 4 ++-- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/_flutterfire_internals/pubspec.yaml b/packages/_flutterfire_internals/pubspec.yaml index 71714ce193e6..a5b1d0bed783 100755 --- a/packages/_flutterfire_internals/pubspec.yaml +++ b/packages/_flutterfire_internals/pubspec.yaml @@ -9,15 +9,15 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.0.0 + collection: ^1.17.1 firebase_core: ^2.15.0 firebase_core_platform_interface: ^4.8.0 flutter: sdk: flutter - meta: ^1.8.0 + meta: ^1.9.1 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.0.0 + mockito: ^5.4.2 test: any diff --git a/packages/cloud_firestore/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pubspec.yaml index a5e4aee7d37c..cfe727449bc0 100755 --- a/packages/cloud_firestore/cloud_firestore/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pubspec.yaml @@ -17,7 +17,7 @@ environment: dependencies: cloud_firestore_platform_interface: ^5.15.3 cloud_firestore_web: ^3.6.3 - collection: ^1.17.2 + collection: ^1.17.1 firebase_core: ^2.15.0 firebase_core_platform_interface: ^4.8.0 flutter: diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml b/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml index 3ca113a632ca..c56b74bb3dee 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml @@ -10,15 +10,15 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 - collection: ^1.15.0 + collection: ^1.17.1 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.8.0 - plugin_platform_interface: ^2.1.3 + meta: ^1.9.1 + plugin_platform_interface: ^2.1.4 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.0.0 + mockito: ^5.4.2 diff --git a/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml b/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml index 6908e245ad16..5cc0fb2e14f3 100644 --- a/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml @@ -12,20 +12,20 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 cloud_firestore_platform_interface: ^5.15.3 - collection: ^1.0.0 + collection: ^1.17.1 firebase_core: ^2.15.0 firebase_core_web: ^2.6.0 flutter: sdk: flutter flutter_web_plugins: sdk: flutter - js: ^0.6.3 + js: ^0.6.7 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.0.0 + mockito: ^5.4.2 flutter: plugin: diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml index e7541cbe0482..bf90c3f36aad 100644 --- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml +++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: build: ^2.0.1 build_config: ^1.0.0 cloud_firestore_odm: ^1.0.0-dev.63 - collection: ^1.15.0 + collection: ^1.17.1 freezed_annotation: '>=1.0.0 <3.0.0' # Can be removed once this is fixed https://github.com/dart-lang/graphs/issues/86 graphs: '>=2.0.0 <2.3.0' diff --git a/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml b/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml index db59b76aae8d..69fd4b1eda66 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml @@ -12,16 +12,16 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 - collection: ^1.16.0 + collection: ^1.17.1 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.8.0 - plugin_platform_interface: ^2.1.3 + meta: ^1.9.1 + plugin_platform_interface: ^2.1.4 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.4.0 - pigeon: ^9.2.5 + mockito: ^5.4.2 + pigeon: ^10.1.3 diff --git a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml index e26cbdcaeecf..ddc6dde56b56 100644 --- a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml +++ b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml @@ -11,15 +11,15 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.0.0 + collection: ^1.17.1 flutter: sdk: flutter # Needed to export the mocks flutter_test: sdk: flutter - meta: ^1.8.0 - plugin_platform_interface: ^2.1.3 + meta: ^1.9.1 + plugin_platform_interface: ^2.1.4 dev_dependencies: - mockito: ^5.4.0 - pigeon: ^9.2.5 + mockito: ^5.4.2 + pigeon: ^10.1.3 diff --git a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml index bb3ed0178203..389dde205141 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml @@ -10,15 +10,15 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 - collection: ^1.15.0 + collection: ^1.17.1 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.8.0 - plugin_platform_interface: ^2.1.3 + meta: ^1.9.1 + plugin_platform_interface: ^2.1.4 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.0.0 + mockito: ^5.4.2 diff --git a/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml b/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml index 5152ec320315..4b9799a31373 100755 --- a/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml +++ b/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml @@ -9,15 +9,15 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 - collection: ^1.14.3 + collection: ^1.17.1 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.8.0 - plugin_platform_interface: ^2.1.3 + meta: ^1.9.1 + plugin_platform_interface: ^2.1.4 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.0.2 + mockito: ^5.4.2 diff --git a/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml b/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml index 5ff2f91049ab..0ae608451015 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml @@ -8,15 +8,15 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.15.0 + collection: ^1.17.1 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.8.0 - plugin_platform_interface: ^2.1.3 + meta: ^1.9.1 + plugin_platform_interface: ^2.1.4 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.0.0 + mockito: ^5.4.2 diff --git a/packages/firebase_ui_database/pubspec.yaml b/packages/firebase_ui_database/pubspec.yaml index f2131b2e8616..5d632c3b31a1 100644 --- a/packages/firebase_ui_database/pubspec.yaml +++ b/packages/firebase_ui_database/pubspec.yaml @@ -8,7 +8,7 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.17.2 + collection: ^1.17.1 firebase_database: ^10.2.4 firebase_ui_localizations: ^1.5.0 flutter: diff --git a/tests/pubspec.yaml b/tests/pubspec.yaml index e1b6572ca2e5..d090679c753e 100644 --- a/tests/pubspec.yaml +++ b/tests/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: cloud_functions: ^4.3.4 cloud_functions_platform_interface: ^5.4.4 cloud_functions_web: ^4.5.4 - collection: ^1.15.0 + collection: ^1.17.1 firebase_analytics: ^10.4.4 firebase_analytics_platform_interface: ^3.6.4 firebase_analytics_web: ^0.5.4+4 @@ -48,7 +48,7 @@ dependencies: firebase_storage_web: ^3.6.5 flutter: sdk: flutter - http: ^0.13.4 + http: ^1.1.0 dev_dependencies: flutter_test: From fdb53258a6d392f6a5d5480ded54d1504cad400f Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 12:37:38 +0200 Subject: [PATCH 03/18] Fix stack_trace version --- packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml index 6ce561ecdd00..9051bf511ea9 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: firebase_crashlytics_platform_interface: ^3.6.4 flutter: sdk: flutter - stack_trace: ^1.11.1 + stack_trace: ^1.11.0 dev_dependencies: flutter_test: From 44bc9d8d605eae967e0f12edc227684ec89f1253 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 12:42:59 +0200 Subject: [PATCH 04/18] Fix twitter_login version --- packages/firebase_ui_auth/example/pubspec.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/firebase_ui_auth/example/pubspec.yaml b/packages/firebase_ui_auth/example/pubspec.yaml index 4fa198821941..a22390fd22c1 100644 --- a/packages/firebase_ui_auth/example/pubspec.yaml +++ b/packages/firebase_ui_auth/example/pubspec.yaml @@ -38,19 +38,19 @@ dependencies: dev_dependencies: drive: ^1.0.0-1.0.nullsafety.1 firebase_ui_shared: ^1.3.0 - flutter_facebook_auth: ^5.0.8 + flutter_facebook_auth: ^5.0.11 flutter_driver: sdk: flutter flutter_test: sdk: flutter - flutter_lints: ^2.0.0 - google_sign_in: ^6.1.0 - http: ^0.13.4 + flutter_lints: ^2.0.2 + google_sign_in: ^6.1.4 + http: ^1.1.0 integration_test: sdk: flutter - mockito: ^5.0.0 + mockito: ^5.4.2 test: any - twitter_login: ^4.3.2 + twitter_login: ^4.4.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter. From ac9f85a29fa499f72065167c5606ecb90b3a3b69 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 12:47:51 +0200 Subject: [PATCH 05/18] Fix flutter_facebook_auth --- packages/firebase_ui_auth/example/pubspec.yaml | 2 +- packages/firebase_ui_oauth_facebook/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_ui_auth/example/pubspec.yaml b/packages/firebase_ui_auth/example/pubspec.yaml index a22390fd22c1..ccb68bfe5b2c 100644 --- a/packages/firebase_ui_auth/example/pubspec.yaml +++ b/packages/firebase_ui_auth/example/pubspec.yaml @@ -38,7 +38,7 @@ dependencies: dev_dependencies: drive: ^1.0.0-1.0.nullsafety.1 firebase_ui_shared: ^1.3.0 - flutter_facebook_auth: ^5.0.11 + flutter_facebook_auth: ^6.0.0 flutter_driver: sdk: flutter flutter_test: diff --git a/packages/firebase_ui_oauth_facebook/pubspec.yaml b/packages/firebase_ui_oauth_facebook/pubspec.yaml index b2d50eab0941..a7f00491bb6d 100644 --- a/packages/firebase_ui_oauth_facebook/pubspec.yaml +++ b/packages/firebase_ui_oauth_facebook/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: firebase_ui_oauth: ^1.4.6 flutter: sdk: flutter - flutter_facebook_auth: ^5.0.11 + flutter_facebook_auth: ^6.0.0 dev_dependencies: flutter_test: From b2e67537ad28b59196a367799b49b7c9779a1fb5 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 13:36:28 +0200 Subject: [PATCH 06/18] Fix analyzer --- .../firebase_app_installations/example/lib/main.dart | 6 +++--- .../firebase_ml_model_downloader/example/lib/main.dart | 10 +++++----- .../firebase_ml_model_downloader/example/pubspec.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart b/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart index 45c92010aa4c..a3f4d0cffcc4 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart +++ b/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart @@ -40,7 +40,7 @@ class InstallationsCard extends StatefulWidget { const InstallationsCard({Key? key}) : super(key: key); @override - _InstallationsCardState createState() => _InstallationsCardState(); + State createState() => _InstallationsCardState(); } class _InstallationsCardState extends State { @@ -89,10 +89,10 @@ class _InstallationsCardState extends State { Future getId() async { try { - final _newid = await FirebaseInstallations.instance.getId(); + final newId = await FirebaseInstallations.instance.getId(); setState(() { - id = _newid; + id = newId; }); } catch (e) { log('$e'); diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart index 8a95f2065f12..6b30de63d622 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart @@ -34,13 +34,13 @@ class _MyAppState extends State { FirebaseCustomModel? model; - /// Initially get the lcoal model if found, and asynchronously get the latest one in background. + /// Initially get the local model if found, and asynchronously get the latest one in background. initWithLocalModel() async { - final _model = await FirebaseModelDownloader.instance.getModel( + final model = await FirebaseModelDownloader.instance.getModel( kModelName, FirebaseModelDownloadType.localModelUpdateInBackground); setState(() { - model = _model; + this.model = model; }); } @@ -82,12 +82,12 @@ class _MyAppState extends State { Expanded( child: ElevatedButton( onPressed: () async { - final _model = await FirebaseModelDownloader.instance + final model = await FirebaseModelDownloader.instance .getModel(kModelName, FirebaseModelDownloadType.latestModel); setState(() { - model = _model; + this.model = model; }); }, child: const Text('Get latest model'), diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml index d94a941bc399..f738e27b9d9f 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: flutter: sdk: flutter - + firebase_core: ^2.15.0 firebase_ml_model_downloader: ^0.2.3+4 dev_dependencies: From ca4d0fd0f6148141e76bc13b940d9c3b281683fb Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 13:38:32 +0200 Subject: [PATCH 07/18] Format java file --- .../plugins/firebase/auth/FlutterFirebaseAuthPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java b/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java index c7c67de1f265..1cfde706d28f 100755 --- a/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java +++ b/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java @@ -85,7 +85,7 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { channel = null; messenger = null; - + removeEventListeners(); } From bfd51a2a44f743f9839b822090f96f7a93c97f24 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 13:49:41 +0200 Subject: [PATCH 08/18] Clang format --- .../firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_auth/firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h b/packages/firebase_auth/firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h index 77a361c2c43a..139a7d365bd0 100644 --- a/packages/firebase_auth/firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h +++ b/packages/firebase_auth/firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h @@ -13,8 +13,8 @@ #import #import -#import #import +#import @interface FLTFirebaseAuthPlugin : FLTFirebasePlugin Date: Wed, 19 Jul 2023 14:17:55 +0200 Subject: [PATCH 09/18] Use Java SDK 17 --- .github/workflows/e2e_tests.yaml | 8 ++++---- .github/workflows/firebase_firestore_odm.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index 3c01bf41c61e..c7047f367f73 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -41,7 +41,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 name: Gradle Cache with: @@ -113,7 +113,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -188,7 +188,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -257,7 +257,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' diff --git a/.github/workflows/firebase_firestore_odm.yaml b/.github/workflows/firebase_firestore_odm.yaml index f09597e69941..57c140c4620d 100644 --- a/.github/workflows/firebase_firestore_odm.yaml +++ b/.github/workflows/firebase_firestore_odm.yaml @@ -61,7 +61,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' From 01c03e37e9e8d784f08a386075304621091fff1e Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 19 Jul 2023 14:47:43 +0200 Subject: [PATCH 10/18] Add missing namespace --- tests/android/app/build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 79b1e39f14b7..ebeb6212332c 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -29,6 +29,14 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + // Conditional for compatibility with AGP <4.2. + if (project.android.hasProperty("namespace")) { + namespace 'io.flutter.plugins.firebase.tests' + } + buildFeatures { + buildConfig = true + } + compileSdkVersion 34 compileOptions { From d3230e9a22dbbdc8fd0a87f417bb92808746649d Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Mon, 31 Jul 2023 01:25:31 +0200 Subject: [PATCH 11/18] Revert pubspec changes --- packages/_flutterfire_internals/pubspec.yaml | 6 +++--- .../cloud_firestore/android/build.gradle | 2 +- .../cloud_firestore/example/android/app/build.gradle | 4 ++-- .../cloud_firestore/cloud_firestore/pubspec.yaml | 6 +++--- .../cloud_firestore_platform_interface/pubspec.yaml | 8 ++++---- .../cloud_firestore/cloud_firestore_web/pubspec.yaml | 6 +++--- .../cloud_firestore_odm_generator/pubspec.yaml | 2 +- .../cloud_functions/android/build.gradle | 2 +- .../cloud_functions/example/android/app/build.gradle | 4 ++-- .../cloud_functions/cloud_functions/pubspec.yaml | 2 +- .../firebase_analytics/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_app_check/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_app_check/pubspec.yaml | 6 +++--- .../firebase_app_installations/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_app_installations/pubspec.yaml | 4 ++-- .../firebase_auth/firebase_auth/example/pubspec.yaml | 4 ++-- packages/firebase_auth/firebase_auth/pubspec.yaml | 8 ++++---- .../firebase_auth_platform_interface/pubspec.yaml | 10 +++++----- .../firebase_core/firebase_core/android/build.gradle | 2 +- packages/firebase_core/firebase_core/pubspec.yaml | 6 +++--- .../firebase_core_platform_interface/pubspec.yaml | 8 ++++---- .../firebase_crashlytics/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_crashlytics/pubspec.yaml | 2 +- .../pubspec.yaml | 8 ++++---- .../firebase_database/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_database/firebase_database/pubspec.yaml | 2 +- .../pubspec.yaml | 8 ++++---- .../firebase_dynamic_links/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_dynamic_links/example/pubspec.yaml | 2 +- .../firebase_dynamic_links/pubspec.yaml | 6 +++--- .../firebase_in_app_messaging/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_in_app_messaging/pubspec.yaml | 4 ++-- .../firebase_messaging/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_messaging/example/pubspec.yaml | 6 +++--- .../firebase_messaging/pubspec.yaml | 8 ++++---- .../android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_ml_model_downloader/pubspec.yaml | 4 ++-- .../firebase_performance/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_performance/example/pubspec.yaml | 4 ++-- .../firebase_performance/pubspec.yaml | 8 ++++---- .../firebase_remote_config/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_remote_config/pubspec.yaml | 6 +++--- .../firebase_storage/android/build.gradle | 2 +- .../example/android/app/build.gradle | 4 ++-- .../firebase_storage/example/pubspec.yaml | 4 ++-- .../firebase_storage/firebase_storage/pubspec.yaml | 6 +++--- .../firebase_storage_platform_interface/pubspec.yaml | 8 ++++---- packages/firebase_ui_auth/example/pubspec.yaml | 12 ++++++------ packages/firebase_ui_auth/pubspec.yaml | 6 +++--- packages/firebase_ui_database/example/pubspec.yaml | 6 +++--- packages/firebase_ui_database/pubspec.yaml | 4 ++-- packages/firebase_ui_firestore/example/pubspec.yaml | 6 +++--- packages/firebase_ui_firestore/pubspec.yaml | 4 ++-- .../firebase_ui_localizations/example/pubspec.yaml | 4 ++-- packages/firebase_ui_localizations/pubspec.yaml | 4 ++-- packages/firebase_ui_oauth/pubspec.yaml | 4 ++-- packages/firebase_ui_oauth_apple/pubspec.yaml | 2 +- packages/firebase_ui_oauth_facebook/pubspec.yaml | 2 +- packages/firebase_ui_oauth_google/pubspec.yaml | 4 ++-- packages/firebase_ui_oauth_twitter/pubspec.yaml | 4 ++-- packages/firebase_ui_shared/pubspec.yaml | 2 +- packages/firebase_ui_storage/pubspec.yaml | 8 ++++---- tests/android/app/build.gradle | 4 ++-- tests/pubspec.yaml | 4 ++-- 75 files changed, 164 insertions(+), 164 deletions(-) diff --git a/packages/_flutterfire_internals/pubspec.yaml b/packages/_flutterfire_internals/pubspec.yaml index a5b1d0bed783..71714ce193e6 100755 --- a/packages/_flutterfire_internals/pubspec.yaml +++ b/packages/_flutterfire_internals/pubspec.yaml @@ -9,15 +9,15 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.17.1 + collection: ^1.0.0 firebase_core: ^2.15.0 firebase_core_platform_interface: ^4.8.0 flutter: sdk: flutter - meta: ^1.9.1 + meta: ^1.8.0 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.0 test: any diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index ca28cb3b92ec..41186540f5c2 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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 ea4e6f715307..1905b3fbe304 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -29,7 +29,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -47,7 +47,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.firestore.example" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/packages/cloud_firestore/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pubspec.yaml index cfe727449bc0..e96f0d9db84f 100755 --- a/packages/cloud_firestore/cloud_firestore/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pubspec.yaml @@ -17,17 +17,17 @@ environment: dependencies: cloud_firestore_platform_interface: ^5.15.3 cloud_firestore_web: ^3.6.3 - collection: ^1.17.1 + collection: ^1.0.0 firebase_core: ^2.15.0 firebase_core_platform_interface: ^4.8.0 flutter: sdk: flutter - meta: ^1.9.1 + meta: ^1.8.0 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.0 flutter: plugin: diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml b/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml index c56b74bb3dee..3ca113a632ca 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml @@ -10,15 +10,15 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 - collection: ^1.17.1 + collection: ^1.15.0 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.9.1 - plugin_platform_interface: ^2.1.4 + meta: ^1.8.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.0 diff --git a/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml b/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml index 5cc0fb2e14f3..6908e245ad16 100644 --- a/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml @@ -12,20 +12,20 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 cloud_firestore_platform_interface: ^5.15.3 - collection: ^1.17.1 + collection: ^1.0.0 firebase_core: ^2.15.0 firebase_core_web: ^2.6.0 flutter: sdk: flutter flutter_web_plugins: sdk: flutter - js: ^0.6.7 + js: ^0.6.3 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.0 flutter: plugin: diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml index bf90c3f36aad..e7541cbe0482 100644 --- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml +++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: build: ^2.0.1 build_config: ^1.0.0 cloud_firestore_odm: ^1.0.0-dev.63 - collection: ^1.17.1 + collection: ^1.15.0 freezed_annotation: '>=1.0.0 <3.0.0' # Can be removed once this is fixed https://github.com/dart-lang/graphs/issues/86 graphs: '>=2.0.0 <2.3.0' diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 24703990cc34..99a179388661 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle index e009ed1f0919..07515cba7ca2 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.functions.example' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.functions.example" minSdkVersion 16 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/cloud_functions/cloud_functions/pubspec.yaml b/packages/cloud_functions/cloud_functions/pubspec.yaml index 71466365ba80..a600f1a711b6 100644 --- a/packages/cloud_functions/cloud_functions/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - plugin_platform_interface: ^2.1.4 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index 46716c0d6a6f..a2a3b7831b12 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 defaultConfig { minSdkVersion 19 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle index 2ed02213f3db..a3b4f9e3ebfa 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services' android { namespace 'io.flutter.plugins.firebase.analytics.example' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -36,7 +36,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.analytics.example" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle index b23e8bd402ab..e1548841a09b 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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 9dd2bd7c1566..790ae215ef31 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 @@ -29,12 +29,12 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "io.flutter.plugins.firebase.appcheck.example" - compileSdkVersion 34 + compileSdkVersion 33 defaultConfig { applicationId "io.flutter.plugins.firebase.appcheck.example" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_app_check/firebase_app_check/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/pubspec.yaml index 8f4545c62340..3c2e0d1ab501 100644 --- a/packages/firebase_app_check/firebase_app_check/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/pubspec.yaml @@ -20,11 +20,11 @@ dependencies: sdk: flutter dev_dependencies: - async: ^2.11.0 + async: ^2.5.0 flutter_test: sdk: flutter - mockito: ^5.4.2 - plugin_platform_interface: ^2.1.4 + mockito: ^5.0.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index 41b2a0c1dc1b..e68531f3df64 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 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 28a28d9963ba..ca00667c9e87 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 @@ -28,7 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.installations.example' - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -47,7 +47,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.flutter.plugins.firebase.installations.example" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml index ca03285e55e3..d219631fed07 100644 --- a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml @@ -23,8 +23,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 - plugin_platform_interface: ^2.1.4 + mockito: ^5.0.16 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_auth/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/firebase_auth/example/pubspec.yaml index 4ddd5f2d880a..35be268c7670 100644 --- a/packages/firebase_auth/firebase_auth/example/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/example/pubspec.yaml @@ -11,10 +11,10 @@ dependencies: flutter: sdk: flutter flutter_signin_button: ^2.0.0 - google_sign_in: ^6.1.4 + google_sign_in: ^6.1.0 dev_dependencies: - http: ^1.1.0 + http: ^0.13.3 flutter: uses-material-design: true diff --git a/packages/firebase_auth/firebase_auth/pubspec.yaml b/packages/firebase_auth/firebase_auth/pubspec.yaml index 625a626e996a..6ebdd51b75c5 100755 --- a/packages/firebase_auth/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/pubspec.yaml @@ -20,14 +20,14 @@ dependencies: firebase_core_platform_interface: ^4.8.0 flutter: sdk: flutter - meta: ^1.9.1 + meta: ^1.8.0 dev_dependencies: - async: ^2.11.0 + async: ^2.5.0 flutter_test: sdk: flutter - mockito: ^5.4.2 - plugin_platform_interface: ^2.1.4 + mockito: ^5.0.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml b/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml index 69fd4b1eda66..db59b76aae8d 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml @@ -12,16 +12,16 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 - collection: ^1.17.1 + collection: ^1.16.0 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.9.1 - plugin_platform_interface: ^2.1.4 + meta: ^1.8.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.4.2 - pigeon: ^10.1.3 + mockito: ^5.4.0 + pigeon: ^9.2.5 diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 42141877b33a..bd688f92541f 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -29,7 +29,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 defaultConfig { minSdkVersion 16 diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index a365b7f66986..a0c57dfa7bda 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -17,13 +17,13 @@ dependencies: firebase_core_web: ^2.6.0 flutter: sdk: flutter - meta: ^1.9.1 + meta: ^1.8.0 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 - plugin_platform_interface: ^2.1.4 + mockito: ^5.0.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml index ddc6dde56b56..0a9dc82ba15d 100644 --- a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml +++ b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml @@ -17,9 +17,9 @@ dependencies: # Needed to export the mocks flutter_test: sdk: flutter - meta: ^1.9.1 - plugin_platform_interface: ^2.1.4 + meta: ^1.8.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: - mockito: ^5.4.2 - pigeon: ^10.1.3 + mockito: ^5.4.0 + pigeon: ^9.2.5 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index 74eb9bde1d91..a578728ed5ce 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -42,7 +42,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle index fb8a62364a21..3d45cb6c164a 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecrashlyticsexample' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId 'io.flutter.plugins.firebasecrashlyticsexample' minSdkVersion 19 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml index 9051bf511ea9..3c07f0cc687f 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: firebase_crashlytics_platform_interface: ^3.6.4 flutter: sdk: flutter - stack_trace: ^1.11.0 + stack_trace: ^1.10.0 dev_dependencies: flutter_test: diff --git a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml index 389dde205141..bb3ed0178203 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml @@ -10,15 +10,15 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 - collection: ^1.17.1 + collection: ^1.15.0 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.9.1 - plugin_platform_interface: ^2.1.4 + meta: ^1.8.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.0 diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index 7a5c283e4cf2..dd76903ad3e2 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 defaultConfig { minSdkVersion 19 diff --git a/packages/firebase_database/firebase_database/example/android/app/build.gradle b/packages/firebase_database/firebase_database/example/android/app/build.gradle index d67c96195672..12f502b90546 100755 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.database.example' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId 'io.flutter.plugins.firebase.database.example' minSdkVersion 19 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_database/firebase_database/pubspec.yaml b/packages/firebase_database/firebase_database/pubspec.yaml index 2fff375e6a52..86df3b93d11c 100755 --- a/packages/firebase_database/firebase_database/pubspec.yaml +++ b/packages/firebase_database/firebase_database/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.2 flutter: plugin: diff --git a/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml b/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml index 4b9799a31373..5152ec320315 100755 --- a/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml +++ b/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml @@ -9,15 +9,15 @@ environment: dependencies: _flutterfire_internals: ^1.3.4 - collection: ^1.17.1 + collection: ^1.14.3 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.9.1 - plugin_platform_interface: ^2.1.4 + meta: ^1.8.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.2 diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index bbb4b0953a36..dee061c89210 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle index 8d84a368e637..78a67ad9d563 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.dynamiclinksexample' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.dynamiclinksexample" minSdkVersion 19 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/pubspec.yaml b/packages/firebase_dynamic_links/firebase_dynamic_links/example/pubspec.yaml index 51d339ba63f1..bb142778e191 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/pubspec.yaml +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: firebase_dynamic_links: ^5.3.4 flutter: sdk: flutter - url_launcher: ^6.1.12 + url_launcher: ^6.1.10 flutter: uses-material-design: true diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/firebase_dynamic_links/pubspec.yaml index 48e46773079c..a6a407c17ae4 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/pubspec.yaml +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/pubspec.yaml @@ -19,13 +19,13 @@ dependencies: firebase_dynamic_links_platform_interface: ^0.2.6+4 flutter: sdk: flutter - meta: ^1.9.1 - plugin_platform_interface: ^2.1.4 + meta: ^1.8.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.0 flutter: plugin: diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index af141ebef4ae..db424b905dfa 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle index 059d17d1ff6e..7017f7770656 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml index 42fba280e6a2..c941575aa974 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml @@ -17,12 +17,12 @@ dependencies: firebase_in_app_messaging_platform_interface: ^0.2.4+4 flutter: sdk: flutter - meta: ^1.9.1 + meta: ^1.8.0 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.16 plugin_platform_interface: null flutter: diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index abd87ade62e1..776decf55111 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle index 39b882fa462c..96fb245e2cdd 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.messaging.example' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.messaging.example" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml index 92ce71447afc..2dcce03f8ba6 100644 --- a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml @@ -10,12 +10,12 @@ dependencies: firebase_messaging: ^14.6.5 flutter: sdk: flutter - flutter_local_notifications: ^15.1.0+1 - http: ^1.1.0 + flutter_local_notifications: ^14.0.0+1 + http: ^0.13.0 dependency_overrides: # Override for `flutter_local_notifications`: - plugin_platform_interface: ^2.1.4 + plugin_platform_interface: ^2.1.3 flutter: uses-material-design: true diff --git a/packages/firebase_messaging/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/pubspec.yaml index bf292f25a859..f18d33e47e1c 100644 --- a/packages/firebase_messaging/firebase_messaging/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/pubspec.yaml @@ -19,14 +19,14 @@ dependencies: firebase_messaging_web: ^3.5.4 flutter: sdk: flutter - meta: ^1.9.1 + meta: ^1.8.0 dev_dependencies: - async: ^2.11.0 + async: ^2.5.0 flutter_test: sdk: flutter - mockito: ^5.4.2 - plugin_platform_interface: ^2.1.4 + mockito: ^5.0.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index 3b3ab9f00dad..97716e520bef 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle index 0fd56c22e38f..f583097273a0 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle @@ -29,7 +29,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -39,7 +39,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml index 746d97a8707c..4f5fe19b3c9b 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml @@ -21,8 +21,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 - plugin_platform_interface: ^2.1.4 + mockito: ^5.0.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 423fcc15ffee..2197613c83f4 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 defaultConfig { minSdkVersion 16 diff --git a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle index 7c4e3e0d15a0..c83aba7fac88 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -36,7 +36,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_performance/firebase_performance/example/pubspec.yaml b/packages/firebase_performance/firebase_performance/example/pubspec.yaml index f44bce7ca091..8d4c584d8634 100644 --- a/packages/firebase_performance/firebase_performance/example/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/example/pubspec.yaml @@ -11,14 +11,14 @@ dependencies: firebase_performance: ^0.9.2+4 flutter: sdk: flutter - http: ^1.1.0 + http: ^0.13.0 dev_dependencies: flutter_test: sdk: flutter integration_test: sdk: flutter - pedantic: ^1.11.1 + pedantic: ^1.8.0 flutter: uses-material-design: true diff --git a/packages/firebase_performance/firebase_performance/pubspec.yaml b/packages/firebase_performance/firebase_performance/pubspec.yaml index 42937ac44fe3..882f390b2ee9 100644 --- a/packages/firebase_performance/firebase_performance/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/pubspec.yaml @@ -25,10 +25,10 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - http: ^1.1.0 - mockito: ^5.4.2 - pedantic: ^1.11.1 - plugin_platform_interface: ^2.1.4 + http: ^0.13.0 + mockito: ^5.0.0 + pedantic: ^1.8.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle index d389c232ea2c..5b855c7d73e5 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle index 8886e9604c45..fe5fd2f8e517 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.remoteconfig.example' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.remoteconfig.example" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml index 7e59fc385ce0..e77ad53a12a7 100644 --- a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml @@ -24,9 +24,9 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 - pedantic: ^1.11.1 - plugin_platform_interface: ^2.1.4 + mockito: ^5.0.0 + pedantic: ^1.8.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index bdf7fec220d9..8efe3ba6319d 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -51,7 +51,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle index 74ca2b2c875c..12865218052f 100755 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasestorageexample' - compileSdkVersion 34 + compileSdkVersion 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { defaultConfig { applicationId 'io.flutter.plugins.firebasestorageexample' minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_storage/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/firebase_storage/example/pubspec.yaml index 696669d1185a..86c7debcc496 100755 --- a/packages/firebase_storage/firebase_storage/example/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/example/pubspec.yaml @@ -9,8 +9,8 @@ dependencies: firebase_storage: ^11.2.5 flutter: sdk: flutter - image_picker: ^1.0.1 - image_picker_for_web: ^2.2.0 + image_picker: ^0.8.7+4 + image_picker_for_web: ^2.1.12 flutter: uses-material-design: true diff --git a/packages/firebase_storage/firebase_storage/pubspec.yaml b/packages/firebase_storage/firebase_storage/pubspec.yaml index 5001044a7774..50a6d4230bef 100755 --- a/packages/firebase_storage/firebase_storage/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/pubspec.yaml @@ -23,9 +23,9 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - http: ^1.1.0 - mockito: ^5.4.2 - plugin_platform_interface: ^2.1.4 + http: ^0.13.0 + mockito: ^5.0.0 + plugin_platform_interface: ^2.1.3 flutter: plugin: diff --git a/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml b/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml index 0ae608451015..5ff2f91049ab 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml @@ -8,15 +8,15 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.17.1 + collection: ^1.15.0 firebase_core: ^2.15.0 flutter: sdk: flutter - meta: ^1.9.1 - plugin_platform_interface: ^2.1.4 + meta: ^1.8.0 + plugin_platform_interface: ^2.1.3 dev_dependencies: firebase_core_platform_interface: ^4.8.0 flutter_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.0 diff --git a/packages/firebase_ui_auth/example/pubspec.yaml b/packages/firebase_ui_auth/example/pubspec.yaml index ccb68bfe5b2c..4fa198821941 100644 --- a/packages/firebase_ui_auth/example/pubspec.yaml +++ b/packages/firebase_ui_auth/example/pubspec.yaml @@ -38,19 +38,19 @@ dependencies: dev_dependencies: drive: ^1.0.0-1.0.nullsafety.1 firebase_ui_shared: ^1.3.0 - flutter_facebook_auth: ^6.0.0 + flutter_facebook_auth: ^5.0.8 flutter_driver: sdk: flutter flutter_test: sdk: flutter - flutter_lints: ^2.0.2 - google_sign_in: ^6.1.4 - http: ^1.1.0 + flutter_lints: ^2.0.0 + google_sign_in: ^6.1.0 + http: ^0.13.4 integration_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.0.0 test: any - twitter_login: ^4.4.1 + twitter_login: ^4.3.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter. diff --git a/packages/firebase_ui_auth/pubspec.yaml b/packages/firebase_ui_auth/pubspec.yaml index 366d83550a3e..ff914abaacbb 100644 --- a/packages/firebase_ui_auth/pubspec.yaml +++ b/packages/firebase_ui_auth/pubspec.yaml @@ -9,7 +9,7 @@ environment: flutter: '>=3.3.0' dependencies: - email_validator: ^2.1.17 + email_validator: ^2.0.1 firebase_auth: ^4.7.1 firebase_core: ^2.15.0 firebase_dynamic_links: ^5.3.4 @@ -24,8 +24,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 - mockito: ^5.4.2 + flutter_lints: ^2.0.0 + mockito: ^5.4.0 false_secrets: - '/example/**/google-services.json' diff --git a/packages/firebase_ui_database/example/pubspec.yaml b/packages/firebase_ui_database/example/pubspec.yaml index 6667662bb879..5c8c460d7e25 100644 --- a/packages/firebase_ui_database/example/pubspec.yaml +++ b/packages/firebase_ui_database/example/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: firebase_ui_database: ^1.3.4 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.5 + cupertino_icons: ^1.0.2 firebase_core: ^2.15.0 firebase_database: ^10.2.4 dev_dependencies: @@ -41,14 +41,14 @@ dev_dependencies: sdk: flutter integration_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.3.0 # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_database/pubspec.yaml b/packages/firebase_ui_database/pubspec.yaml index 5d632c3b31a1..cd528acac194 100644 --- a/packages/firebase_ui_database/pubspec.yaml +++ b/packages/firebase_ui_database/pubspec.yaml @@ -8,7 +8,7 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.17.1 + collection: ^1.16.0 firebase_database: ^10.2.4 firebase_ui_localizations: ^1.5.0 flutter: @@ -17,7 +17,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_firestore/example/pubspec.yaml b/packages/firebase_ui_firestore/example/pubspec.yaml index 27691ff5ab46..7538b279f77c 100644 --- a/packages/firebase_ui_firestore/example/pubspec.yaml +++ b/packages/firebase_ui_firestore/example/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: sdk: flutter firebase_ui_firestore: ^1.5.5 cloud_firestore: ^4.8.3 - cupertino_icons: ^1.0.5 + cupertino_icons: ^1.0.2 firebase_core: ^2.15.0 dev_dependencies: drive: ^1.0.0-1.0.nullsafety.1 @@ -39,14 +39,14 @@ dev_dependencies: sdk: flutter integration_test: sdk: flutter - mockito: ^5.4.2 + mockito: ^5.3.0 # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_firestore/pubspec.yaml b/packages/firebase_ui_firestore/pubspec.yaml index 536e3cfbfa5a..8280f7a188ac 100644 --- a/packages/firebase_ui_firestore/pubspec.yaml +++ b/packages/firebase_ui_firestore/pubspec.yaml @@ -16,8 +16,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 - mockito: ^5.4.2 + flutter_lints: ^2.0.0 + mockito: ^5.3.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_localizations/example/pubspec.yaml b/packages/firebase_ui_localizations/example/pubspec.yaml index 8793a1ac8a4a..f3f2a5290e9f 100644 --- a/packages/firebase_ui_localizations/example/pubspec.yaml +++ b/packages/firebase_ui_localizations/example/pubspec.yaml @@ -29,7 +29,7 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - cupertino_icons: ^1.0.5 + cupertino_icons: ^1.0.2 firebase_core: ^2.15.0 firebase_ui_auth: ^1.6.1 @@ -40,7 +40,7 @@ dependencies: sdk: flutter dev_dependencies: - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 flutter_test: sdk: flutter diff --git a/packages/firebase_ui_localizations/pubspec.yaml b/packages/firebase_ui_localizations/pubspec.yaml index 7d0d20731184..164a5b041e93 100644 --- a/packages/firebase_ui_localizations/pubspec.yaml +++ b/packages/firebase_ui_localizations/pubspec.yaml @@ -15,12 +15,12 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - path: ^1.8.3 + path: ^1.8.2 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_oauth/pubspec.yaml b/packages/firebase_ui_oauth/pubspec.yaml index b8a371ed7934..12783ab7b28f 100644 --- a/packages/firebase_ui_oauth/pubspec.yaml +++ b/packages/firebase_ui_oauth/pubspec.yaml @@ -12,14 +12,14 @@ dependencies: firebase_auth: ^4.7.1 firebase_ui_auth: ^1.6.1 firebase_ui_shared: ^1.3.0 - flutter_svg: ^2.0.7 + flutter_svg: ^2.0.5 flutter: sdk: flutter dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 false_secrets: - '/example/**/google-services.json' diff --git a/packages/firebase_ui_oauth_apple/pubspec.yaml b/packages/firebase_ui_oauth_apple/pubspec.yaml index 78de348c1425..94badc6ca190 100644 --- a/packages/firebase_ui_oauth_apple/pubspec.yaml +++ b/packages/firebase_ui_oauth_apple/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_oauth_facebook/pubspec.yaml b/packages/firebase_ui_oauth_facebook/pubspec.yaml index a7f00491bb6d..bd2f2a8e4b66 100644 --- a/packages/firebase_ui_oauth_facebook/pubspec.yaml +++ b/packages/firebase_ui_oauth_facebook/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: firebase_ui_oauth: ^1.4.6 flutter: sdk: flutter - flutter_facebook_auth: ^6.0.0 + flutter_facebook_auth: ^5.0.8 dev_dependencies: flutter_test: diff --git a/packages/firebase_ui_oauth_google/pubspec.yaml b/packages/firebase_ui_oauth_google/pubspec.yaml index 7bf99c2b4277..07177fabb538 100644 --- a/packages/firebase_ui_oauth_google/pubspec.yaml +++ b/packages/firebase_ui_oauth_google/pubspec.yaml @@ -12,12 +12,12 @@ dependencies: firebase_ui_oauth: ^1.4.6 flutter: sdk: flutter - google_sign_in: ^6.1.4 + google_sign_in: ^6.1.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 false_secrets: - '/example/**/google-services.json' diff --git a/packages/firebase_ui_oauth_twitter/pubspec.yaml b/packages/firebase_ui_oauth_twitter/pubspec.yaml index 24b34b89b5ab..1384e9291f7b 100644 --- a/packages/firebase_ui_oauth_twitter/pubspec.yaml +++ b/packages/firebase_ui_oauth_twitter/pubspec.yaml @@ -12,12 +12,12 @@ dependencies: sdk: flutter firebase_auth: ^4.7.1 firebase_ui_oauth: ^1.4.6 - twitter_login: ^4.4.1 + twitter_login: ^4.3.2 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/firebase_ui_shared/pubspec.yaml b/packages/firebase_ui_shared/pubspec.yaml index 72f52201b359..18120aa69530 100644 --- a/packages/firebase_ui_shared/pubspec.yaml +++ b/packages/firebase_ui_shared/pubspec.yaml @@ -14,6 +14,6 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 flutter: diff --git a/packages/firebase_ui_storage/pubspec.yaml b/packages/firebase_ui_storage/pubspec.yaml index d717dcc155fa..0694c47edce4 100644 --- a/packages/firebase_ui_storage/pubspec.yaml +++ b/packages/firebase_ui_storage/pubspec.yaml @@ -15,15 +15,15 @@ dependencies: sdk: flutter firebase_storage: ^11.2.5 firebase_ui_shared: ^1.3.0 - path: ^1.8.3 + path: ^1.8.2 uuid: ^3.0.7 - file_selector: ^1.0.0 + file_selector: ^0.9.2+4 flutter_blurhash: ^0.7.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 - mockito: ^5.4.2 + flutter_lints: ^2.0.0 + mockito: ^5.3.2 flutter: diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index ebeb6212332c..1f7ff1c1160c 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -37,7 +37,7 @@ android { buildConfig = true } - compileSdkVersion 34 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +56,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.flutter.plugins.firebase.tests" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/tests/pubspec.yaml b/tests/pubspec.yaml index d090679c753e..e1b6572ca2e5 100644 --- a/tests/pubspec.yaml +++ b/tests/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: cloud_functions: ^4.3.4 cloud_functions_platform_interface: ^5.4.4 cloud_functions_web: ^4.5.4 - collection: ^1.17.1 + collection: ^1.15.0 firebase_analytics: ^10.4.4 firebase_analytics_platform_interface: ^3.6.4 firebase_analytics_web: ^0.5.4+4 @@ -48,7 +48,7 @@ dependencies: firebase_storage_web: ^3.6.5 flutter: sdk: flutter - http: ^1.1.0 + http: ^0.13.4 dev_dependencies: flutter_test: From 9093907d7744308aa6b66f33123475f70c31d93e Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Mon, 31 Jul 2023 01:33:57 +0200 Subject: [PATCH 12/18] Fix --- .../firebase_core/firebase_core_platform_interface/pubspec.yaml | 2 +- packages/firebase_ui_oauth/pubspec.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml index 0a9dc82ba15d..e26cbdcaeecf 100644 --- a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml +++ b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml @@ -11,7 +11,7 @@ environment: flutter: '>=3.3.0' dependencies: - collection: ^1.17.1 + collection: ^1.0.0 flutter: sdk: flutter # Needed to export the mocks diff --git a/packages/firebase_ui_oauth/pubspec.yaml b/packages/firebase_ui_oauth/pubspec.yaml index a646ae060713..c48f1d2f1a1a 100644 --- a/packages/firebase_ui_oauth/pubspec.yaml +++ b/packages/firebase_ui_oauth/pubspec.yaml @@ -11,8 +11,6 @@ dependencies: desktop_webview_auth: ^0.0.13 firebase_auth: ^4.7.2 firebase_ui_auth: ^1.6.2 - firebase_auth: ^4.7.2 - firebase_ui_auth: ^1.6.2 firebase_ui_shared: ^1.3.0 flutter_svg: ^2.0.5 flutter: From ff772a92ce51917a6d0a35dd8be43e151aaee1c2 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Mon, 31 Jul 2023 01:36:52 +0200 Subject: [PATCH 13/18] Fix --- packages/firebase_ui_oauth/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_ui_oauth/pubspec.yaml b/packages/firebase_ui_oauth/pubspec.yaml index c48f1d2f1a1a..925018b8faa9 100644 --- a/packages/firebase_ui_oauth/pubspec.yaml +++ b/packages/firebase_ui_oauth/pubspec.yaml @@ -8,7 +8,7 @@ environment: flutter: '>=3.3.0' dependencies: - desktop_webview_auth: ^0.0.13 + desktop_webview_auth: ^0.0.11 firebase_auth: ^4.7.2 firebase_ui_auth: ^1.6.2 firebase_ui_shared: ^1.3.0 From 6edea9e5e2a4eaf742ca2ce98c27831d5794ad65 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Tue, 1 Aug 2023 14:36:27 +0200 Subject: [PATCH 14/18] `compileSdkVersion` -> `compileSdk` --- packages/cloud_firestore/cloud_firestore/android/build.gradle | 2 +- .../cloud_firestore/example/android/app/build.gradle | 2 +- packages/cloud_functions/cloud_functions/android/build.gradle | 2 +- .../cloud_functions/example/android/app/build.gradle | 2 +- .../firebase_analytics/firebase_analytics/android/build.gradle | 2 +- .../firebase_analytics/example/android/app/build.gradle | 2 +- .../firebase_app_check/firebase_app_check/android/build.gradle | 2 +- .../firebase_app_check/example/android/app/build.gradle | 2 +- .../firebase_app_installations/android/build.gradle | 2 +- .../firebase_app_installations/example/android/app/build.gradle | 2 +- packages/firebase_auth/firebase_auth/android/build.gradle | 2 +- .../firebase_auth/example/android/app/build.gradle | 2 +- packages/firebase_core/firebase_core/android/build.gradle | 2 +- .../firebase_core/example/android/app/build.gradle | 2 +- .../firebase_crashlytics/android/build.gradle | 2 +- .../firebase_crashlytics/example/android/app/build.gradle | 2 +- .../firebase_database/firebase_database/android/build.gradle | 2 +- .../firebase_database/example/android/app/build.gradle | 2 +- .../firebase_dynamic_links/android/build.gradle | 2 +- .../firebase_dynamic_links/example/android/app/build.gradle | 2 +- .../firebase_in_app_messaging/android/build.gradle | 2 +- .../firebase_in_app_messaging/example/android/app/build.gradle | 2 +- .../firebase_messaging/firebase_messaging/android/build.gradle | 2 +- .../firebase_messaging/example/android/app/build.gradle | 2 +- .../firebase_ml_model_downloader/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../firebase_performance/android/build.gradle | 2 +- .../firebase_performance/example/android/app/build.gradle | 2 +- .../firebase_remote_config/android/build.gradle | 2 +- .../firebase_remote_config/example/android/app/build.gradle | 2 +- packages/firebase_storage/firebase_storage/android/build.gradle | 2 +- .../firebase_storage/example/android/app/build.gradle | 2 +- packages/firebase_ui_auth/example/android/app/build.gradle | 2 +- packages/firebase_ui_database/example/android/app/build.gradle | 2 +- packages/firebase_ui_firestore/example/android/app/build.gradle | 2 +- .../firebase_ui_localizations/example/android/app/build.gradle | 2 +- packages/firebase_ui_oauth/example/android/app/build.gradle | 2 +- packages/firebase_ui_storage/example/android/app/build.gradle | 2 +- tests/android/app/build.gradle | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 41186540f5c2..1e604fa5dc95 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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 1905b3fbe304..3430cdcac207 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -29,7 +29,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 99a179388661..c9eda49a8f43 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle index 07515cba7ca2..f59e62150603 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.functions.example' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index a2a3b7831b12..bda60775e586 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 defaultConfig { minSdkVersion 19 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle index a3b4f9e3ebfa..e7dbdf482ba6 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services' android { namespace 'io.flutter.plugins.firebase.analytics.example' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle index e1548841a09b..9279b5d592c5 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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 790ae215ef31..0dbe80b698c6 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 @@ -29,7 +29,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "io.flutter.plugins.firebase.appcheck.example" - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.appcheck.example" diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index e68531f3df64..cc7fd3f9c67d 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 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 ca00667c9e87..099acaaef65b 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 @@ -28,7 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.installations.example' - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 4b51605d4b3a..b74f9b13d8f8 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index a594e005038c..7273d497ec0b 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -34,7 +34,7 @@ android { buildConfig = true } - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index bd688f92541f..97a5aa31c5df 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -29,7 +29,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 defaultConfig { minSdkVersion 16 diff --git a/packages/firebase_core/firebase_core/example/android/app/build.gradle b/packages/firebase_core/firebase_core/example/android/app/build.gradle index 5f47847f94a1..7afa9a1bf3e9 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecoreexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index a578728ed5ce..a5162b8175a6 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -42,7 +42,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle index 3d45cb6c164a..ad83e6dda9ac 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecrashlyticsexample' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index dd76903ad3e2..c1c7c951a20f 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 defaultConfig { minSdkVersion 19 diff --git a/packages/firebase_database/firebase_database/example/android/app/build.gradle b/packages/firebase_database/firebase_database/example/android/app/build.gradle index 12f502b90546..2fee87ac23ed 100755 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.database.example' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index dee061c89210..48a9aac1b52d 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle index 78a67ad9d563..b8d7070b131c 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.dynamiclinksexample' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index db424b905dfa..9a32019922c7 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle index 7017f7770656..8ac6a7bf3da4 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index 776decf55111..811413d4e54e 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle index 96fb245e2cdd..1233527e4b71 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.messaging.example' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index 97716e520bef..976540260dcb 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle index f583097273a0..51f967c63347 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle @@ -29,7 +29,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 2197613c83f4..e5fc4056cb0e 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 defaultConfig { minSdkVersion 16 diff --git a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle index c83aba7fac88..f38d5ac0fa6f 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle index 5b855c7d73e5..2a7618104d91 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -43,7 +43,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle index fe5fd2f8e517..b836b51f8458 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.remoteconfig.example' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 8efe3ba6319d..062b2d811196 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -51,7 +51,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle index 12865218052f..0e43238df1e3 100755 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasestorageexample' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_ui_auth/example/android/app/build.gradle b/packages/firebase_ui_auth/example/android/app/build.gradle index 3ff3fc3d5148..c75347ff5877 100644 --- a/packages/firebase_ui_auth/example/android/app/build.gradle +++ b/packages/firebase_ui_auth/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/firebase_ui_database/example/android/app/build.gradle b/packages/firebase_ui_database/example/android/app/build.gradle index 211a0556b8d7..759ed54726b7 100644 --- a/packages/firebase_ui_database/example/android/app/build.gradle +++ b/packages/firebase_ui_database/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/firebase_ui_firestore/example/android/app/build.gradle b/packages/firebase_ui_firestore/example/android/app/build.gradle index 211a0556b8d7..759ed54726b7 100644 --- a/packages/firebase_ui_firestore/example/android/app/build.gradle +++ b/packages/firebase_ui_firestore/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/firebase_ui_localizations/example/android/app/build.gradle b/packages/firebase_ui_localizations/example/android/app/build.gradle index 0531088dfa35..fd9a0c75e8ab 100644 --- a/packages/firebase_ui_localizations/example/android/app/build.gradle +++ b/packages/firebase_ui_localizations/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_localizations_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/firebase_ui_oauth/example/android/app/build.gradle b/packages/firebase_ui_oauth/example/android/app/build.gradle index b6612c60e5ad..53ad20a98733 100644 --- a/packages/firebase_ui_oauth/example/android/app/build.gradle +++ b/packages/firebase_ui_oauth/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_oauth_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_ui_storage/example/android/app/build.gradle b/packages/firebase_ui_storage/example/android/app/build.gradle index 7efd45136c6e..83144cac8f7e 100644 --- a/packages/firebase_ui_storage/example/android/app/build.gradle +++ b/packages/firebase_ui_storage/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 1f7ff1c1160c..2fab034d7caf 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -37,7 +37,7 @@ android { buildConfig = true } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 From 53677c3abd7d59a3c7755b29fd6b6eb1103c6115 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Tue, 1 Aug 2023 14:42:08 +0200 Subject: [PATCH 15/18] Revert pubspec+example changes --- .../firebase_app_installations/example/lib/main.dart | 6 +++--- .../firebase_app_installations/example/pubspec.yaml | 2 +- .../firebase_ml_model_downloader/example/lib/main.dart | 8 ++++---- .../firebase_ml_model_downloader/example/pubspec.yaml | 4 ++-- packages/firebase_ui_oauth_facebook/pubspec.yaml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart b/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart index a3f4d0cffcc4..952e78aa8252 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart +++ b/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart @@ -40,7 +40,7 @@ class InstallationsCard extends StatefulWidget { const InstallationsCard({Key? key}) : super(key: key); @override - State createState() => _InstallationsCardState(); + _InstallationsCardState createState() => _InstallationsCardState(); } class _InstallationsCardState extends State { @@ -89,10 +89,10 @@ class _InstallationsCardState extends State { Future getId() async { try { - final newId = await FirebaseInstallations.instance.getId(); + final _newId = await FirebaseInstallations.instance.getId(); setState(() { - id = newId; + id = _newId; }); } catch (e) { log('$e'); diff --git a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml index a9ec336767e7..f831e784a2ca 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: sdk: flutter dev_dependencies: - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 flutter: uses-material-design: true diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart index 6b30de63d622..a19069f8cda5 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart @@ -36,11 +36,11 @@ class _MyAppState extends State { /// Initially get the local model if found, and asynchronously get the latest one in background. initWithLocalModel() async { - final model = await FirebaseModelDownloader.instance.getModel( + final _model = await FirebaseModelDownloader.instance.getModel( kModelName, FirebaseModelDownloadType.localModelUpdateInBackground); setState(() { - this.model = model; + model = _model; }); } @@ -82,12 +82,12 @@ class _MyAppState extends State { Expanded( child: ElevatedButton( onPressed: () async { - final model = await FirebaseModelDownloader.instance + final _model = await FirebaseModelDownloader.instance .getModel(kModelName, FirebaseModelDownloadType.latestModel); setState(() { - this.model = model; + model = _model; }); }, child: const Text('Get latest model'), diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml index f738e27b9d9f..c0d700cc560c 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml @@ -9,11 +9,11 @@ environment: dependencies: flutter: sdk: flutter - firebase_core: ^2.15.0 + firebase_ml_model_downloader: ^0.2.3+4 dev_dependencies: - flutter_lints: ^2.0.2 + flutter_lints: ^1.0.0 flutter: uses-material-design: true diff --git a/packages/firebase_ui_oauth_facebook/pubspec.yaml b/packages/firebase_ui_oauth_facebook/pubspec.yaml index 6bdd3c844034..13de4df32123 100644 --- a/packages/firebase_ui_oauth_facebook/pubspec.yaml +++ b/packages/firebase_ui_oauth_facebook/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.2 + flutter_lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From e88bbb1b96e0670823801ad95d55322c88881f06 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Tue, 1 Aug 2023 14:44:53 +0200 Subject: [PATCH 16/18] Revert pubspec --- .../firebase_app_installations/example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml index f831e784a2ca..36f2c1123b2d 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: sdk: flutter dev_dependencies: - flutter_lints: ^2.0.0 + flutter_lints: ^1.0.0 flutter: uses-material-design: true From f6cfd4137086b1f78600d0c0f486ac9e3e224df1 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Tue, 1 Aug 2023 14:46:24 +0200 Subject: [PATCH 17/18] Revert variable name --- .../firebase_app_installations/example/lib/main.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart b/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart index 952e78aa8252..45c92010aa4c 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart +++ b/packages/firebase_app_installations/firebase_app_installations/example/lib/main.dart @@ -89,10 +89,10 @@ class _InstallationsCardState extends State { Future getId() async { try { - final _newId = await FirebaseInstallations.instance.getId(); + final _newid = await FirebaseInstallations.instance.getId(); setState(() { - id = _newId; + id = _newid; }); } catch (e) { log('$e'); From 8313e8d0894eecc26e39daa8b3f146ebd7b09739 Mon Sep 17 00:00:00 2001 From: Cristian Zazo Date: Wed, 2 Aug 2023 13:08:01 +0200 Subject: [PATCH 18/18] Update example's `compileSdk` to 33 --- .../firebase_auth/example/android/app/build.gradle | 2 +- .../firebase_core/example/android/app/build.gradle | 2 +- packages/firebase_ui_auth/example/android/app/build.gradle | 2 +- packages/firebase_ui_database/example/android/app/build.gradle | 2 +- packages/firebase_ui_firestore/example/android/app/build.gradle | 2 +- .../firebase_ui_localizations/example/android/app/build.gradle | 2 +- packages/firebase_ui_oauth/example/android/app/build.gradle | 2 +- packages/firebase_ui_storage/example/android/app/build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index 7273d497ec0b..e57212075db8 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -34,7 +34,7 @@ android { buildConfig = true } - compileSdk flutter.compileSdkVersion + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_core/firebase_core/example/android/app/build.gradle b/packages/firebase_core/firebase_core/example/android/app/build.gradle index 7afa9a1bf3e9..e5b0164e8526 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecoreexample' - compileSdk flutter.compileSdkVersion + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_ui_auth/example/android/app/build.gradle b/packages/firebase_ui_auth/example/android/app/build.gradle index c75347ff5877..ce936b685f42 100644 --- a/packages/firebase_ui_auth/example/android/app/build.gradle +++ b/packages/firebase_ui_auth/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdk flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/firebase_ui_database/example/android/app/build.gradle b/packages/firebase_ui_database/example/android/app/build.gradle index 759ed54726b7..68e1f88e851f 100644 --- a/packages/firebase_ui_database/example/android/app/build.gradle +++ b/packages/firebase_ui_database/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdk flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/firebase_ui_firestore/example/android/app/build.gradle b/packages/firebase_ui_firestore/example/android/app/build.gradle index 759ed54726b7..68e1f88e851f 100644 --- a/packages/firebase_ui_firestore/example/android/app/build.gradle +++ b/packages/firebase_ui_firestore/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdk flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/firebase_ui_localizations/example/android/app/build.gradle b/packages/firebase_ui_localizations/example/android/app/build.gradle index fd9a0c75e8ab..82431e5112f0 100644 --- a/packages/firebase_ui_localizations/example/android/app/build.gradle +++ b/packages/firebase_ui_localizations/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_localizations_example' - compileSdk flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/firebase_ui_oauth/example/android/app/build.gradle b/packages/firebase_ui_oauth/example/android/app/build.gradle index 53ad20a98733..2467c05e468e 100644 --- a/packages/firebase_ui_oauth/example/android/app/build.gradle +++ b/packages/firebase_ui_oauth/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_oauth_example' - compileSdk flutter.compileSdkVersion + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_ui_storage/example/android/app/build.gradle b/packages/firebase_ui_storage/example/android/app/build.gradle index 83144cac8f7e..1e144f70c4e7 100644 --- a/packages/firebase_ui_storage/example/android/app/build.gradle +++ b/packages/firebase_ui_storage/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdk flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions {