From ee2269f0039581b678465108c292d7fd7e5b3ebf Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Thu, 27 Feb 2020 14:12:24 -0800 Subject: [PATCH 1/2] Update firebase_core to use new platform interface --- packages/firebase_core/firebase_core/CHANGELOG.md | 4 ++++ packages/firebase_core/firebase_core/pubspec.yaml | 3 ++- .../firebase_core/test/firebase_core_test.dart | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/firebase_core/firebase_core/CHANGELOG.md b/packages/firebase_core/firebase_core/CHANGELOG.md index 5b4899b8d09c..b953d73aaddc 100644 --- a/packages/firebase_core/firebase_core/CHANGELOG.md +++ b/packages/firebase_core/firebase_core/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.4+2 + +* Update dependency on firebase_core_platform_interface to 1.0.4. + ## 0.4.4+1 * Make the pedantic dev_dependency explicit. diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index 5285d8ccafe7..1aab22e4f501 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -18,7 +18,7 @@ flutter: default_package: firebase_core_web dependencies: - firebase_core_platform_interface: ^1.0.0 + firebase_core_platform_interface: ^1.0.4 flutter: sdk: flutter meta: "^1.0.5" @@ -37,6 +37,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: ^4.1.1 + plugin_platform_interface: ^1.0.2 environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" diff --git a/packages/firebase_core/firebase_core/test/firebase_core_test.dart b/packages/firebase_core/firebase_core/test/firebase_core_test.dart index 94d059094ba8..a917d15623c8 100755 --- a/packages/firebase_core/firebase_core/test/firebase_core_test.dart +++ b/packages/firebase_core/firebase_core/test/firebase_core_test.dart @@ -6,6 +6,7 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; +import 'package:plugin_platform_interface/plugin_platform_interface.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -31,7 +32,6 @@ void main() { setUp(() async { mock = MockFirebaseCore(); - when(mock.isMock).thenReturn(true); FirebaseCorePlatform.instance = mock; final PlatformFirebaseApp app = PlatformFirebaseApp( @@ -102,4 +102,6 @@ void main() { }); } -class MockFirebaseCore extends Mock implements FirebaseCorePlatform {} +class MockFirebaseCore extends Mock + with MockPlatformInterfaceMixin + implements FirebaseCorePlatform {} From fa2abc0d1f7f8e287815f83a5b3775dedbc92a83 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Thu, 27 Feb 2020 14:23:36 -0800 Subject: [PATCH 2/2] Fix version in pubspec --- packages/firebase_core/firebase_core/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index 1aab22e4f501..59e5f965e989 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_core description: Flutter plugin for Firebase Core, enabling connecting to multiple Firebase apps. homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_core/firebase_core -version: 0.4.4+1 +version: 0.4.4+2 flutter: plugin: