From 0593700abbc01f6b4639425fadcafa6dd070babc Mon Sep 17 00:00:00 2001 From: Joshua Tang Date: Mon, 25 Sep 2023 00:58:56 +1000 Subject: [PATCH 1/2] Revert "fix(deps): update firebase dependencies (#883)" This reverts commit a3ff62db9af38d08e490fd04fe37d71eb89ea65e. --- macos/Podfile.lock | 67 +++++++++---------- pubspec.lock | 36 +++++----- pubspec.yaml | 6 +- .../flutter/generated_plugin_registrant.cc | 3 - windows/flutter/generated_plugins.cmake | 1 - 5 files changed, 54 insertions(+), 59 deletions(-) diff --git a/macos/Podfile.lock b/macos/Podfile.lock index fb54cdf6..7ca346a1 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -1,28 +1,28 @@ PODS: - - Firebase/Analytics (10.15.0): + - Firebase/Analytics (10.12.0): - Firebase/Core - - Firebase/Auth (10.15.0): + - Firebase/Auth (10.12.0): - Firebase/CoreOnly - - FirebaseAuth (~> 10.15.0) - - Firebase/Core (10.15.0): + - FirebaseAuth (~> 10.12.0) + - Firebase/Core (10.12.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.15.0) - - Firebase/CoreOnly (10.15.0): - - FirebaseCore (= 10.15.0) - - firebase_analytics (10.5.0): - - Firebase/Analytics (= 10.15.0) + - FirebaseAnalytics (~> 10.12.0) + - Firebase/CoreOnly (10.12.0): + - FirebaseCore (= 10.12.0) + - firebase_analytics (10.4.5): + - Firebase/Analytics (= 10.12.0) - firebase_core - FlutterMacOS - - firebase_auth (4.10.0): - - Firebase/Auth (~> 10.15.0) - - Firebase/CoreOnly (~> 10.15.0) + - firebase_auth (4.9.0): + - Firebase/Auth (~> 10.12.0) + - Firebase/CoreOnly (~> 10.12.0) - firebase_core - FlutterMacOS - - firebase_core (2.16.0): - - Firebase/CoreOnly (~> 10.15.0) + - firebase_core (2.15.1): + - Firebase/CoreOnly (~> 10.12.0) - FlutterMacOS - - FirebaseAnalytics (10.15.0): - - FirebaseAnalytics/AdIdSupport (= 10.15.0) + - FirebaseAnalytics (10.12.0): + - FirebaseAnalytics/AdIdSupport (= 10.12.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) @@ -30,24 +30,23 @@ PODS: - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (10.15.0): + - FirebaseAnalytics/AdIdSupport (10.12.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement (= 10.15.0) + - GoogleAppMeasurement (= 10.12.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - FirebaseAppCheckInterop (10.15.0) - - FirebaseAuth (10.15.0): + - FirebaseAuth (10.12.0): - FirebaseAppCheckInterop (~> 10.0) - FirebaseCore (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/Environment (~> 7.8) - GTMSessionFetcher/Core (< 4.0, >= 2.1) - - RecaptchaInterop (~> 100.0) - - FirebaseCore (10.15.0): + - FirebaseCore (10.12.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) @@ -59,21 +58,21 @@ PODS: - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - FlutterMacOS (1.0.0) - - GoogleAppMeasurement (10.15.0): - - GoogleAppMeasurement/AdIdSupport (= 10.15.0) + - GoogleAppMeasurement (10.12.0): + - GoogleAppMeasurement/AdIdSupport (= 10.12.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.15.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.15.0) + - GoogleAppMeasurement/AdIdSupport (10.12.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.12.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.15.0): + - GoogleAppMeasurement/WithoutAdIdSupport (10.12.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) @@ -182,18 +181,18 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos SPEC CHECKSUMS: - Firebase: 66043bd4579e5b73811f96829c694c7af8d67435 - firebase_analytics: d83909b465e2de400a9585a99459079bc35e39e1 - firebase_auth: 3aa31e1997141eadf1d3518e67162bbfa498300c - firebase_core: 4d49ac49b029aa297ba35d8137947478528550c2 - FirebaseAnalytics: 47cef43728f81a839cf1306576bdd77ffa2eac7e + Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0 + firebase_analytics: 9b489de49d018316c4157a0375a735f701310127 + firebase_auth: d1343ed5a697e39bc05e1b964384869da92a3d50 + firebase_core: 559d892df9267acc6b7254d46fb3041866777509 + FirebaseAnalytics: 0270389efbe3022b54ec4588862dabec3477ee98 FirebaseAppCheckInterop: a8c555b1c2db1d9445e6c3a08a848167ddb7eb51 - FirebaseAuth: a55ec5f7f8a5b1c2dd750235c1bb419bfb642445 - FirebaseCore: 2cec518b43635f96afe7ac3a9c513e47558abd2e + FirebaseAuth: a66c1e14ec58f41d154a4b41ce1a23ea00ad4805 + FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed FirebaseCoreInternal: 2f4bee5ed00301b5e56da0849268797a2dd31fb4 FirebaseInstallations: cae95cab0f965ce05b805189de1d4c70b11c76fb FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - GoogleAppMeasurement: 722db6550d1e6d552b08398b69a975ac61039338 + GoogleAppMeasurement: 2d800fab85e7848b1e66a6f8ce5bca06c5aad892 GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 diff --git a/pubspec.lock b/pubspec.lock index 242e5dbf..7df0d276 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "2d8e8e123ca3675625917f535fcc0d3a50092eef44334168f9b18adc050d4c6e" + sha256: "1a5e13736d59235ce0139621b4bbe29bc89839e202409081bc667eb3cd20674c" url: "https://pub.dev" source: hosted - version: "1.3.6" + version: "1.3.5" analyzer: dependency: transitive description: @@ -379,58 +379,58 @@ packages: dependency: "direct main" description: name: firebase_analytics - sha256: c35213b72c9dbab6a20954bb968ed70e7d9e0ea3acb3426b9d4f4a51a522cdb4 + sha256: "82992b2e93e4752d30296a881f65dde6dfdc09671f9a8cf994fa5d453bd72bde" url: "https://pub.dev" source: hosted - version: "10.5.0" + version: "10.4.5" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - sha256: "9a8bdbf5345de01f7f1905c9ab6f9bff0b7fd739620d68c16b3b3b639b487dc3" + sha256: b277ab49112ebc4e545c7fc4fdfab99f692f7cd0e35347f8ed6c85d52a87562c url: "https://pub.dev" source: hosted - version: "3.7.0" + version: "3.6.5" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - sha256: da79ab9c1e32c389cd6224939a0437a9e074783e3f2b51e9dc6d850d769d9af8 + sha256: "3f05999c06294dbdc05f4afef2b8976e6f57eb449e6aaa07ff751784763a68e0" url: "https://pub.dev" source: hosted - version: "0.5.5" + version: "0.5.4+5" firebase_auth: dependency: "direct main" description: name: firebase_auth - sha256: e7b7e2a08888cb8ef073a9b6d4df9039ea0ff07c920d4258fb4886c55fe2dbb6 + sha256: "6d9be853426ab686d68076b8007ac29b2c31e7d549444a45b5c3fe1abc249fb0" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.9.0" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: "4862bd649268e32ebd685a58abe1eb7ef13aef3f668ce9c56a7d283c971ec6ff" + sha256: "2946cfdc17f925fa9771dd0ba3ce9dd2d019100a8685d0557c161f7786ea9b14" url: "https://pub.dev" source: hosted - version: "6.19.0" + version: "6.18.0" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: "090d531cc0dcf1e39edc0d64cffa18ccc5745b1fd1081a13ee1bf42d861ff764" + sha256: d8972d754702a3f4881184706b8056e2837d0dae91613a43b988c960b8e0d988 url: "https://pub.dev" source: hosted - version: "5.8.1" + version: "5.8.0" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "675c209c94a1817649137cbd113fc4c9ae85e48d03dd578629abbec6d8a4d93d" + sha256: c78132175edda4bc532a71e01a32964e4b4fcf53de7853a422d96dac3725f389 url: "https://pub.dev" source: hosted - version: "2.16.0" + version: "2.15.1" firebase_core_platform_interface: dependency: transitive description: @@ -443,10 +443,10 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: e8c408923cd3a25bd342c576a114f2126769cd1a57106a4edeaa67ea4a84e962 + sha256: "4cf4d2161530332ddc3c562f19823fb897ff37a9a774090d28df99f47370e973" url: "https://pub.dev" source: hosted - version: "2.8.0" + version: "2.7.0" fixnum: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index f90b81e4..ca18c042 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -22,9 +22,9 @@ dependencies: equatable: 2.0.5 expandable: 5.0.1 file_picker: 5.5.0 - firebase_analytics: 10.5.0 - firebase_auth: 4.10.0 - firebase_core: 2.16.0 + firebase_analytics: 10.4.5 + firebase_auth: 4.9.0 + firebase_core: 2.15.1 flex_color_picker: 3.3.0 flutter: sdk: flutter diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index be21b598..9a168b9e 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,7 +6,6 @@ #include "generated_plugin_registrant.h" -#include #include #include #include @@ -14,8 +13,6 @@ #include void RegisterPlugins(flutter::PluginRegistry* registry) { - FirebaseAuthPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi")); FirebaseCorePluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); ScreenRetrieverPluginRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 5bbf8520..cffb7bb2 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - firebase_auth firebase_core screen_retriever sentry_flutter From 164e8b3f5ecd227d2ddcfb89217b7466e97665ac Mon Sep 17 00:00:00 2001 From: zeshuaro Date: Sun, 24 Sep 2023 15:02:41 +0000 Subject: [PATCH 2/2] chore(deps): dependencies maintenance --- macos/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 7ca346a1..31ec371e 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -209,4 +209,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0