Skip to content

Roll mockito to 5.4.0 #3544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Mar 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/camera/camera/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT

* Updates minimum Flutter version to 3.3.
* Aligns Dart and Flutter SDK constraints.

## 0.10.3+2
Expand Down
4 changes: 2 additions & 2 deletions packages/camera/camera/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: Demonstrates how to use the camera plugin.
publish_to: none

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
camera:
Expand Down
6 changes: 3 additions & 3 deletions packages/camera/camera/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 0.10.3+2

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

flutter:
plugin:
Expand All @@ -35,6 +35,6 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
plugin_platform_interface: ^2.0.0
video_player: ^2.0.0
1 change: 1 addition & 0 deletions packages/camera/camera_android_camerax/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT

* Updates minimum Flutter version to 3.3.
* Creates camera_android_camerax plugin for development.
* Adds CameraInfo class and removes unnecessary code from plugin.
* Adds CameraSelector class.
Expand Down
4 changes: 2 additions & 2 deletions packages/camera/camera_android_camerax/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: Demonstrates how to use the camera_android_camerax plugin.
publish_to: 'none'

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
camera_android_camerax:
Expand Down
6 changes: 3 additions & 3 deletions packages/camera/camera_android_camerax/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
publish_to: 'none'

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

flutter:
plugin:
Expand All @@ -30,5 +30,5 @@ dev_dependencies:
build_runner: ^2.1.4
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
pigeon: ^9.1.0
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in camera_android_camerax/test/android_camera_camerax_test.dart.
// Do not manually edit this file.

Expand All @@ -16,8 +16,7 @@ import 'package:camera_android_camerax/src/process_camera_provider.dart'
import 'package:camera_android_camerax/src/use_case.dart' as _i13;
import 'package:flutter/foundation.dart' as _i6;
import 'package:flutter/services.dart' as _i5;
import 'package:flutter/src/widgets/framework.dart' as _i4;
import 'package:flutter/src/widgets/notification_listener.dart' as _i14;
import 'package:flutter/widgets.dart' as _i4;
import 'package:mockito/mockito.dart' as _i1;

// ignore_for_file: type=lint
Expand Down Expand Up @@ -346,7 +345,7 @@ class MockBuildContext extends _i1.Mock implements _i4.BuildContext {
returnValueForMissingStub: null,
);
@override
void dispatchNotification(_i14.Notification? notification) =>
void dispatchNotification(_i4.Notification? notification) =>
super.noSuchMethod(
Invocation.method(
#dispatchNotification,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in camera_android_camerax/test/camera_info_test.dart.
// Do not manually edit this file.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in camera_android_camerax/test/camera_selector_test.dart.
// Do not manually edit this file.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in camera_android_camerax/test/image_capture_test.dart.
// Do not manually edit this file.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in camera_android_camerax/test/preview_test.dart.
// Do not manually edit this file.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in camera_android_camerax/test/process_camera_provider_test.dart.
// Do not manually edit this file.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in camera_android_camerax/test/system_services_test.dart.
// Do not manually edit this file.

Expand Down
4 changes: 4 additions & 0 deletions packages/file_selector/file_selector_ios/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates minimum Flutter version to 3.3.

## 0.5.1+2

* Updates to `pigeon` version 9.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ publish_to: 'none'
version: 1.0.0

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
# The following adds the Cupertino Icons font to your application.
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_ios/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ dev_dependencies:
build_runner: ^2.3.0
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
pigeon: ^9.1.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Mocks generated by Mockito 5.3.0 from annotations
// in file_selector_ios/example/ios/.symlinks/plugins/file_selector_ios/test/file_selector_ios_test.dart.
// Mocks generated by Mockito 5.4.0 from annotations
// in file_selector_ios/test/file_selector_ios_test.dart.
// Do not manually edit this file.

// ignore_for_file: no_leading_underscores_for_library_prefixes
Expand Down Expand Up @@ -32,7 +32,11 @@ class MockTestFileSelectorApi extends _i1.Mock

@override
_i3.Future<List<String?>> openFile(_i4.FileSelectorConfig? config) =>
(super.noSuchMethod(Invocation.method(#openFile, [config]),
returnValue: _i3.Future<List<String?>>.value(<String?>[]))
as _i3.Future<List<String?>>);
(super.noSuchMethod(
Invocation.method(
#openFile,
[config],
),
returnValue: _i3.Future<List<String?>>.value(<String?>[]),
) as _i3.Future<List<String?>>);
}
4 changes: 4 additions & 0 deletions packages/file_selector/file_selector_macos/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates minimum Flutter version to 3.3.

## 0.9.0+7

* Updates to `pigeon` version 9.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ publish_to: 'none'
version: 1.0.0

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
file_selector_macos:
Expand Down
6 changes: 3 additions & 3 deletions packages/file_selector/file_selector_macos/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 0.9.0+7

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

flutter:
plugin:
Expand All @@ -26,5 +26,5 @@ dev_dependencies:
build_runner: ^2.3.2
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
pigeon: ^9.1.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Mocks generated by Mockito 5.3.2 from annotations
// in file_selector_macos/example/macos/Flutter/ephemeral/.symlinks/plugins/file_selector_macos/test/file_selector_macos_test.dart.
// Mocks generated by Mockito 5.4.0 from annotations
// in file_selector_macos/test/file_selector_macos_test.dart.
// Do not manually edit this file.

// ignore_for_file: no_leading_underscores_for_library_prefixes
Expand Down
4 changes: 4 additions & 0 deletions packages/file_selector/file_selector_windows/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates minimum Flutter version to 3.3.

## 0.9.1+7

* Updates to `pigeon` version 9.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ publish_to: 'none'
version: 1.0.0

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
file_selector_platform_interface: ^2.2.0
Expand Down
6 changes: 3 additions & 3 deletions packages/file_selector/file_selector_windows/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 0.9.1+7

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

flutter:
plugin:
Expand All @@ -26,5 +26,5 @@ dev_dependencies:
build_runner: ^2.3.0
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
pigeon: ^9.1.0
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Mocks generated by Mockito 5.2.0 from annotations
// in file_selector_windows/example/windows/flutter/ephemeral/.plugin_symlinks/file_selector_windows/test/file_selector_windows_test.dart.
// Mocks generated by Mockito 5.4.0 from annotations
// in file_selector_windows/test/file_selector_windows_test.dart.
// Do not manually edit this file.

// ignore_for_file: no_leading_underscores_for_library_prefixes
import 'package:file_selector_windows/src/messages.g.dart' as _i3;
import 'package:mockito/mockito.dart' as _i1;

Expand All @@ -16,6 +17,7 @@ import 'test_api.g.dart' as _i2;
// ignore_for_file: prefer_const_constructors
// ignore_for_file: unnecessary_parenthesis
// ignore_for_file: camel_case_types
// ignore_for_file: subtype_of_sealed_class

/// A class which mocks [TestFileSelectorApi].
///
Expand All @@ -27,20 +29,39 @@ class MockTestFileSelectorApi extends _i1.Mock
}

@override
List<String?> showOpenDialog(_i3.SelectionOptions? options,
String? initialDirectory, String? confirmButtonText) =>
List<String?> showOpenDialog(
_i3.SelectionOptions? options,
String? initialDirectory,
String? confirmButtonText,
) =>
(super.noSuchMethod(
Invocation.method(
#showOpenDialog, [options, initialDirectory, confirmButtonText]),
returnValue: <String?>[]) as List<String?>);
Invocation.method(
#showOpenDialog,
[
options,
initialDirectory,
confirmButtonText,
],
),
returnValue: <String?>[],
) as List<String?>);
@override
List<String?> showSaveDialog(
_i3.SelectionOptions? options,
String? initialDirectory,
String? suggestedName,
String? confirmButtonText) =>
_i3.SelectionOptions? options,
String? initialDirectory,
String? suggestedName,
String? confirmButtonText,
) =>
(super.noSuchMethod(
Invocation.method(#showSaveDialog,
[options, initialDirectory, suggestedName, confirmButtonText]),
returnValue: <String?>[]) as List<String?>);
Invocation.method(
#showSaveDialog,
[
options,
initialDirectory,
suggestedName,
confirmButtonText,
],
),
returnValue: <String?>[],
) as List<String?>);
}
1 change: 1 addition & 0 deletions packages/flutter_markdown/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT

* Updates minimum Flutter version to 3.3.
* Aligns Dart and Flutter SDK constraints.

## 0.6.14
Expand Down
4 changes: 2 additions & 2 deletions packages/flutter_markdown/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: Demonstrates how to use the flutter_markdown package.
publish_to: none

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
flutter:
Expand Down
6 changes: 3 additions & 3 deletions packages/flutter_markdown/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 0.6.14

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
flutter:
Expand All @@ -20,5 +20,5 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
standard_message_codec: ^0.0.1+3
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT

* Updates minimum Flutter version to 3.3.
* Aligns Dart and Flutter SDK constraints.

## 2.2.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 2.2.6

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
collection: ^1.15.0
Expand All @@ -21,4 +21,4 @@ dev_dependencies:
async: ^2.5.0
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
Loading