diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md index 618945d30..22d7bec86 100644 --- a/packages/firebase_core/CHANGELOG.md +++ b/packages/firebase_core/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.2.0 + +* Update firebase_core to 4.14.0. +* Update firebase_core_platform_interface to 8.1.1. +* Update minimum Flutter and Dart version to 3.27 and 3.6. +* Sync the example and integration test. +* Fix `androidClientId`, `iosClientId`, and `iosBundleId` being dropped from app options. + ## 0.1.3 * Add an `implements` entry to the pubspec to improve discoverability on pub.dev. diff --git a/packages/firebase_core/README.md b/packages/firebase_core/README.md index f8eace8cb..83463e6e5 100644 --- a/packages/firebase_core/README.md +++ b/packages/firebase_core/README.md @@ -10,8 +10,8 @@ This package is not an _endorsed_ implementation of `firebase_core`. Therefore, ```yaml dependencies: - firebase_core: ^2.4.0 - firebase_core_tizen: ^0.1.3 + firebase_core: ^4.14.0 + firebase_core_tizen: ^0.2.0 ``` Then you can import `firebase_core` in your Dart code: diff --git a/packages/firebase_core/example/integration_test/firebase_core_test.dart b/packages/firebase_core/example/integration_test/firebase_core_test.dart index 39bfa30df..48b2dc565 100644 --- a/packages/firebase_core/example/integration_test/firebase_core_test.dart +++ b/packages/firebase_core/example/integration_test/firebase_core_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Integration tests ported from upstream firebase_core v2.17.0: -// https://github.com/firebase/flutterfire/blob/firebase_core-v2.17.0/tests/integration_test/firebase_core/firebase_core_e2e_test.dart +// Integration tests ported from upstream firebase_core v4.14.0: +// https://github.com/firebase/flutterfire/blob/firebase_core-v4.14.0/tests/integration_test/firebase_core/firebase_core_e2e_test.dart // Originally authored by the Chromium project authors under a BSD-style // license. @@ -80,7 +80,11 @@ void main() { test('FirebaseApp.setAutomaticResourceManagementEnabled()', () async { final FirebaseApp app = Firebase.app(); - await app.setAutomaticResourceManagementEnabled(true); + try { + await app.setAutomaticResourceManagementEnabled(true); + } finally { + await app.setAutomaticResourceManagementEnabled(false); + } }); }); } diff --git a/packages/firebase_core/example/lib/main.dart b/packages/firebase_core/example/lib/main.dart index 07f03b9a5..7c7841e64 100644 --- a/packages/firebase_core/example/lib/main.dart +++ b/packages/firebase_core/example/lib/main.dart @@ -5,7 +5,6 @@ // ignore_for_file: public_member_api_docs, avoid_print import 'dart:async'; -import 'dart:developer'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; @@ -18,42 +17,36 @@ class MyApp extends StatelessWidget { String get name => 'foo'; - FirebaseOptions get firebaseOptions => DefaultFirebaseOptions.currentPlatform; - Future initializeDefault() async { final FirebaseApp app = await Firebase.initializeApp( - options: firebaseOptions, + options: DefaultFirebaseOptions.currentPlatform, ); - log('Initialized default app $app'); print('Initialized default app $app'); } Future initializeSecondary() async { final FirebaseApp app = await Firebase.initializeApp( name: name, - options: firebaseOptions, + options: DefaultFirebaseOptions.currentPlatform, ); - log('Initialized $app'); print('Initialized $app'); } void apps() { - log('Currently initialized apps: ${Firebase.apps}'); - print('Currently initialized apps: ${Firebase.apps}'); + final List apps = Firebase.apps; + print('Currently initialized apps: $apps'); } void options() { - final FirebaseApp app = Firebase.app(name); + final FirebaseApp app = Firebase.app(); final FirebaseOptions options = app.options; - log('Current options for app $name: $options'); - print('Current options for app $name: $options'); + print('Current options for app ${app.name}: $options'); } Future delete() async { final FirebaseApp app = Firebase.app(name); await app.delete(); - log('App $name deleted'); print('App $name deleted'); } @@ -76,14 +69,14 @@ class MyApp extends StatelessWidget { onPressed: initializeSecondary, child: const Text('Initialize secondary app'), ), - ElevatedButton(onPressed: apps, child: const Text('Get apps')), + ElevatedButton(onPressed: apps, child: const Text('List apps')), ElevatedButton( onPressed: options, - child: const Text('List options'), + child: const Text('List default options'), ), ElevatedButton( onPressed: delete, - child: const Text('Delete app'), + child: const Text('Delete secondary app'), ), ], ), diff --git a/packages/firebase_core/example/pubspec.yaml b/packages/firebase_core/example/pubspec.yaml index 9ee31a230..1edf5b605 100644 --- a/packages/firebase_core/example/pubspec.yaml +++ b/packages/firebase_core/example/pubspec.yaml @@ -3,18 +3,18 @@ description: An example application demonstrating calls to Firebase Core. publish_to: "none" environment: - sdk: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: - firebase_core: ^2.4.0 + firebase_core: ^4.14.0 firebase_core_tizen: path: ../ flutter: sdk: flutter dev_dependencies: - firebase_core_platform_interface: ^4.5.2 + firebase_core_platform_interface: ^8.1.1 flutter_driver: sdk: flutter flutter_test: diff --git a/packages/firebase_core/lib/firebase_app_tizen.dart b/packages/firebase_core/lib/firebase_app_tizen.dart index 94ee484f9..81b75d1d9 100644 --- a/packages/firebase_core/lib/firebase_app_tizen.dart +++ b/packages/firebase_core/lib/firebase_app_tizen.dart @@ -27,7 +27,7 @@ class FirebaseApp extends FirebaseAppPlatform { } /// Sets whether automatic resource management is enabled or disabled. - /// This has no affect on Da. + /// This has no effect on Dart. @override Future setAutomaticResourceManagementEnabled(bool enabled) { return Future.value(); diff --git a/packages/firebase_core/lib/firebase_core_tizen.dart b/packages/firebase_core/lib/firebase_core_tizen.dart index 27601b32e..db4b856b3 100644 --- a/packages/firebase_core/lib/firebase_core_tizen.dart +++ b/packages/firebase_core/lib/firebase_core_tizen.dart @@ -16,7 +16,7 @@ class FirebaseCore extends FirebasePlatform { FirebasePlatform.instance = FirebaseCore(); } - FirebaseApp _mapDartToPlatfromApp(core_dart.FirebaseApp app) { + FirebaseApp _mapDartToPlatformApp(core_dart.FirebaseApp app) { final core_dart.FirebaseOptions options = app.options; return FirebaseApp._( @@ -33,6 +33,9 @@ class FirebaseCore extends FirebasePlatform { trackingId: options.trackingId, appGroupId: options.appGroupId, deepLinkURLScheme: options.deepLinkURLScheme, + androidClientId: options.androidClientId, + iosClientId: options.iosClientId, + iosBundleId: options.iosBundleId, ), ); } @@ -40,7 +43,7 @@ class FirebaseCore extends FirebasePlatform { @override List get apps { return core_dart.Firebase.apps - .map(_mapDartToPlatfromApp) + .map(_mapDartToPlatformApp) .toList(growable: false); } @@ -66,7 +69,7 @@ class FirebaseCore extends FirebasePlatform { await core_dart.Firebase.initializeApp( name: name, options: dartOptions); - return _mapDartToPlatfromApp(dartApp); + return _mapDartToPlatformApp(dartApp); } on core_dart.FirebaseException catch (e) { switch (e.code) { case 'no-app': @@ -85,7 +88,7 @@ class FirebaseCore extends FirebasePlatform { @override FirebaseApp app([String name = defaultFirebaseAppName]) { try { - return _mapDartToPlatfromApp(core_dart.Firebase.app(name)); + return _mapDartToPlatformApp(core_dart.Firebase.app(name)); } catch (_) { throw noAppExists(name); } diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml index 1d4697c07..8ac9bcc0b 100644 --- a/packages/firebase_core/pubspec.yaml +++ b/packages/firebase_core/pubspec.yaml @@ -2,15 +2,15 @@ name: firebase_core_tizen description: Tizen implementation of the firebase_core plugin. homepage: https://github.com/flutter-tizen/plugins repository: https://github.com/flutter-tizen/plugins/tree/main/packages/firebase_core -version: 0.1.3 +version: 0.2.0 environment: - sdk: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: firebase_core_dart: ^1.0.1 - firebase_core_platform_interface: ^4.5.2 + firebase_core_platform_interface: ^8.1.1 flutter: sdk: flutter