From e610743ee27c3dfb7c53c408df2d17f21926abe9 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Fri, 16 Dec 2022 15:07:22 +0900 Subject: [PATCH 1/2] [firebase_core] Minor cleanups --- packages/firebase_core/CHANGELOG.md | 4 ++++ packages/firebase_core/README.md | 4 ++-- packages/firebase_core/example/lib/main.dart | 11 ++++++----- packages/firebase_core/example/pubspec.yaml | 4 ++-- ...ebase_app_desktop.dart => firebase_app_tizen.dart} | 2 +- packages/firebase_core/lib/firebase_core_tizen.dart | 7 +++---- packages/firebase_core/pubspec.yaml | 9 ++++++--- 7 files changed, 24 insertions(+), 17 deletions(-) rename packages/firebase_core/lib/{firebase_app_desktop.dart => firebase_app_tizen.dart} (96%) diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md index 607323422..7742a8679 100644 --- a/packages/firebase_core/CHANGELOG.md +++ b/packages/firebase_core/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Rename `firebase_app_desktop.dart` to `firebase_app_tizen.dart`. + ## 0.1.0 * Initial release. diff --git a/packages/firebase_core/README.md b/packages/firebase_core/README.md index 79c4a7d86..6d938b508 100644 --- a/packages/firebase_core/README.md +++ b/packages/firebase_core/README.md @@ -14,8 +14,8 @@ dependencies: firebase_core_tizen: ^0.1.0 ``` -For detailed usage see https://github.com/invertase/flutterfire_desktop#flutterfire-desktop. +For detailed usage, see https://github.com/invertase/flutterfire_desktop#flutterfire-desktop. ## Tizen integration -The implementation of `firebase_core` is based on [FlutterFire Desktop Core](https://github.com/invertase/flutterfire_desktop/tree/main/packages/firebase_core/firebase_core_desktop). FlutterFire Desktop provides dart implementation of the Firebase modules. \ No newline at end of file +The implementation of `firebase_core_tizen` is based on [FlutterFire Desktop Core](https://github.com/invertase/flutterfire_desktop/tree/main/packages/firebase_core/firebase_core_desktop). FlutterFire Desktop provides Dart implementation of the Firebase modules. diff --git a/packages/firebase_core/example/lib/main.dart b/packages/firebase_core/example/lib/main.dart index 85d0b3ff6..9d4c90ca4 100644 --- a/packages/firebase_core/example/lib/main.dart +++ b/packages/firebase_core/example/lib/main.dart @@ -1,4 +1,7 @@ // Copyright (c) Invertase Limited & Contributors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + // ignore_for_file: public_member_api_docs import 'dart:async'; @@ -13,13 +16,11 @@ class MyApp extends StatelessWidget { String get name => 'foo'; - // fill app keys if needed, you can take ones from - // https://github.com/invertase/flutterfire_desktop/blob/main/packages/firebase_core/firebase_core_desktop/example/lib/main.dart FirebaseOptions get firebaseOptions => const FirebaseOptions( - appId: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', - apiKey: 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy', + appId: '1:448618578101:ios:0b650370bb29e29cac3efc', + apiKey: 'AIzaSyAgUhHU8wSJgO5MVNy95tMT07NEjzMOfz0', projectId: 'react-native-firebase-testing', - messagingSenderId: 'zzzzzzzzzzzz', + messagingSenderId: '448618578101', ); Future initializeDefault() async { diff --git a/packages/firebase_core/example/pubspec.yaml b/packages/firebase_core/example/pubspec.yaml index 38374510c..3918d19df 100644 --- a/packages/firebase_core/example/pubspec.yaml +++ b/packages/firebase_core/example/pubspec.yaml @@ -1,9 +1,9 @@ name: firebase_core_tizen_example description: An example application demonstrating calls to Firebase Core. -publish_to: 'none' +publish_to: "none" environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" flutter: ">=2.5.0" dependencies: diff --git a/packages/firebase_core/lib/firebase_app_desktop.dart b/packages/firebase_core/lib/firebase_app_tizen.dart similarity index 96% rename from packages/firebase_core/lib/firebase_app_desktop.dart rename to packages/firebase_core/lib/firebase_app_tizen.dart index 94ee484f9..3a4cc389d 100644 --- a/packages/firebase_core/lib/firebase_app_desktop.dart +++ b/packages/firebase_core/lib/firebase_app_tizen.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license // that can be found in the LICENSE file. -part of 'firebase_core_tizen.dart'; +part of firebase_core_tizen; /// A Dart only implementation of a Firebase app instance. class FirebaseApp extends FirebaseAppPlatform { diff --git a/packages/firebase_core/lib/firebase_core_tizen.dart b/packages/firebase_core/lib/firebase_core_tizen.dart index 0a64318d0..517cea792 100644 --- a/packages/firebase_core/lib/firebase_core_tizen.dart +++ b/packages/firebase_core/lib/firebase_core_tizen.dart @@ -7,12 +7,11 @@ library firebase_core_tizen; import 'package:firebase_core_dart/firebase_core_dart.dart' as core_dart; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart'; -part 'firebase_app_desktop.dart'; +part 'firebase_app_tizen.dart'; -/// Desktop implementation of FirebaseCore for managing Firebase app -/// instances. +/// Tizen implementation of FirebaseCore for managing Firebase app instances. class FirebaseCore extends FirebasePlatform { - /// Called by PluginRegistry to register this plugin as the implementation for Desktop + /// Registers this class as the default instance of [FirebasePlatform]. static void register() { FirebasePlatform.instance = FirebaseCore(); } diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml index 45943d227..3e8528579 100644 --- a/packages/firebase_core/pubspec.yaml +++ b/packages/firebase_core/pubspec.yaml @@ -1,16 +1,16 @@ name: firebase_core_tizen description: Firebase Core for Tizen -version: 0.1.0 homepage: https://github.com/flutter-tizen/plugins repository: https://github.com/flutter-tizen/plugins/tree/master/packages/firebase_core +version: 0.1.0 environment: - sdk: '>=2.18.0 <3.0.0' + sdk: ">=2.17.0 <3.0.0" flutter: ">=2.5.0" dependencies: firebase_core_dart: ^1.0.1 - firebase_core_platform_interface: '>=4.5.0 <4.5.2' + firebase_core_platform_interface: ^4.5.0 flutter: sdk: flutter @@ -19,3 +19,6 @@ flutter: platforms: tizen: dartPluginClass: FirebaseCore + +false_secrets: + - /example/lib/main.dart From 5cb77a1f03fd82b9b3a0060bed59be42a9d61d93 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Fri, 16 Dec 2022 15:35:45 +0900 Subject: [PATCH 2/2] Depend on firebase_core 2.4.0 to fix build error --- packages/firebase_core/CHANGELOG.md | 2 ++ packages/firebase_core/README.md | 2 +- packages/firebase_core/example/pubspec.yaml | 2 +- packages/firebase_core/pubspec.yaml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md index 7742a8679..fb12a1b46 100644 --- a/packages/firebase_core/CHANGELOG.md +++ b/packages/firebase_core/CHANGELOG.md @@ -1,5 +1,7 @@ ## NEXT +* Update firebase_core to 2.4.0. +* Update firebase_core_platform_interface to 4.5.2. * Rename `firebase_app_desktop.dart` to `firebase_app_tizen.dart`. ## 0.1.0 diff --git a/packages/firebase_core/README.md b/packages/firebase_core/README.md index 6d938b508..ae652300d 100644 --- a/packages/firebase_core/README.md +++ b/packages/firebase_core/README.md @@ -10,7 +10,7 @@ This package is not an _endorsed_ implementation of `firebase_core`. Therefore, ```yaml dependencies: - firebase_core: ^1.9.0 + firebase_core: ^2.4.0 firebase_core_tizen: ^0.1.0 ``` diff --git a/packages/firebase_core/example/pubspec.yaml b/packages/firebase_core/example/pubspec.yaml index 3918d19df..702b4f250 100644 --- a/packages/firebase_core/example/pubspec.yaml +++ b/packages/firebase_core/example/pubspec.yaml @@ -7,7 +7,7 @@ environment: flutter: ">=2.5.0" dependencies: - firebase_core: ^1.9.0 + firebase_core: ^2.4.0 firebase_core_tizen: path: ../ flutter: diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml index 3e8528579..1c7353daa 100644 --- a/packages/firebase_core/pubspec.yaml +++ b/packages/firebase_core/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: firebase_core_dart: ^1.0.1 - firebase_core_platform_interface: ^4.5.0 + firebase_core_platform_interface: ^4.5.2 flutter: sdk: flutter