diff --git a/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml index 2af1d6c4c6db..6849b338649d 100644 --- a/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.7.0 <3.0.0" + sdk: '>=2.7.0 <3.0.0' dependencies: cupertino_icons: ^0.1.2 @@ -30,7 +30,7 @@ dependency_overrides: path: ../../../firebase_core/firebase_core_web dev_dependencies: - drive: 0.1.0 + drive: ^1.0.0-1.0.nullsafety.1 flutter_driver: sdk: flutter test: any diff --git a/packages/firebase_app_check/firebase_app_check/example/test_driver/firebase_app_check_e2e.dart b/packages/firebase_app_check/firebase_app_check/example/test_driver/firebase_app_check_e2e.dart index c39055c11ae1..c38604acad9d 100644 --- a/packages/firebase_app_check/firebase_app_check/example/test_driver/firebase_app_check_e2e.dart +++ b/packages/firebase_app_check/firebase_app_check/example/test_driver/firebase_app_check_e2e.dart @@ -1,6 +1,3 @@ -// ignore_for_file: require_trailing_commas -// @dart = 2.9 - // Copyright 2021, the Chromium project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. diff --git a/packages/firebase_app_check/firebase_app_check/example/test_driver/firebase_app_check_e2e_test.dart b/packages/firebase_app_check/firebase_app_check/example/test_driver/firebase_app_check_e2e_test.dart index 2d22ba44a73f..bb4e596d9ec0 100644 --- a/packages/firebase_app_check/firebase_app_check/example/test_driver/firebase_app_check_e2e_test.dart +++ b/packages/firebase_app_check/firebase_app_check/example/test_driver/firebase_app_check_e2e_test.dart @@ -1,5 +1,3 @@ -// ignore_for_file: require_trailing_commas -// @dart=2.9 // Copyright 2021, the Chromium project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. diff --git a/packages/firebase_core/firebase_core/example/pubspec.yaml b/packages/firebase_core/firebase_core/example/pubspec.yaml index 8974871fa72b..2f9ad9ba2905 100644 --- a/packages/firebase_core/firebase_core/example/pubspec.yaml +++ b/packages/firebase_core/firebase_core/example/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_core_example description: Demonstrates how to use the firebase_core plugin. environment: - sdk: ">=2.12.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: firebase_core: @@ -17,7 +17,7 @@ dependency_overrides: path: ../../firebase_core_web dev_dependencies: - e2e: ^0.6.1 + drive: ^1.0.0-1.0.nullsafety.1 flutter_driver: sdk: flutter flutter_test: diff --git a/packages/firebase_core/firebase_core/example/test_driver/firebase_core_e2e.dart b/packages/firebase_core/firebase_core/example/test_driver/firebase_core_e2e.dart index 05a9a6aea6da..4712c2df5ffd 100644 --- a/packages/firebase_core/firebase_core/example/test_driver/firebase_core_e2e.dart +++ b/packages/firebase_core/firebase_core/example/test_driver/firebase_core_e2e.dart @@ -1,23 +1,22 @@ -// ignore_for_file: require_trailing_commas -// @dart = 2.9 - // Copyright 2019, the Chromium project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// @dart=2.9 - import 'dart:io'; -import 'package:e2e/e2e.dart'; 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'; -void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); +import 'package:drive/drive.dart' as drive; + +void main() => drive.main(testsMain); + +void testsMain() { + TestWidgetsFlutterBinding.ensureInitialized(); String testAppName = 'TestApp'; - FirebaseOptions testAppOptions; + FirebaseOptions? testAppOptions; + if (Platform.isIOS || Platform.isMacOS) { testAppOptions = const FirebaseOptions( appId: '1:448618578101:ios:0b650370bb29e29cac3efc', diff --git a/packages/firebase_core/firebase_core/example/test_driver/firebase_core_e2e_test.dart b/packages/firebase_core/firebase_core/example/test_driver/firebase_core_e2e_test.dart index f91ce3f140cb..f9c0fa99a519 100644 --- a/packages/firebase_core/firebase_core/example/test_driver/firebase_core_e2e_test.dart +++ b/packages/firebase_core/firebase_core/example/test_driver/firebase_core_e2e_test.dart @@ -1,12 +1,7 @@ -// ignore_for_file: require_trailing_commas -// @dart = 2.9 - // Copyright 2020, the Chromium project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// @dart=2.9 - -import 'package:e2e/e2e_driver.dart' as e2e; +import 'package:drive/drive_driver.dart' as drive; -Future main() async => e2e.main(); +void main() => drive.main();