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.

Sign up for GitHub

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
auto-submit merged 15 commits into from
Mar 30, 2023
Merged

Roll mockito to 5.4.0 #3544

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8a6595d
Avoid pinning mockito to single version
natebosch Mar 24, 2023
73035f2
Pin to 5.4.0
natebosch Mar 27, 2023
25c601d
Update to a newer pigeon
natebosch Mar 27, 2023
4614b03
Merge branch 'main' into mockito-range
natebosch Mar 27, 2023
3fcc7fd
Merge branch 'main' into mockito-range
natebosch Mar 28, 2023
281f1df
Set minimum Flutter versions to 3.3
stuartmorgan-g Mar 28, 2023
174c280
Updates changelogs for SDK bump
stuartmorgan-g Mar 28, 2023
1708c66
Relax repo tooling mockito slightly to allow tooling to run on Flutte…
stuartmorgan-g Mar 28, 2023
765d159
Regenerate mockito mocks
natebosch Mar 28, 2023
338f7c6
Merge branch 'main' into mockito-range
natebosch Mar 28, 2023
57a3352
Generate more mockito mocks
natebosch Mar 29, 2023
5a01b05
Make a custom mock class private
natebosch Mar 29, 2023
4e28976
Regenerate mocks at an older flutter SDK
natebosch Mar 29, 2023
349a2fc
Regenerate mocks at an older flutter SDK
natebosch Mar 29, 2023
989cc93
Merge branch 'main' into mockito-range
natebosch Mar 29, 2023
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
Next Next commit
Avoid pinning mockito to single version 
The pinned version of `mockito` is incompatible with the latest released
version of `test_api`, and therefore `test`. With flutter package
pinning, the release of the flutter SDK that updates to the next version
of `test_api` will break the version solve with these packages. Using a
constraint that allows a range of versions of `mockito` should allow a
valid version solve.
  • Loading branch information
@natebosch
natebosch committed Mar 24, 2023
commit 8a6595d41fac73caa230ecee064baeffd8f2c4a3
2 changes: 1 addition & 1 deletion packages/camera/camera/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.0.0
video_player: ^2.0.0
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ dev_dependencies:
build_runner: ^2.1.4
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
pigeon: ^3.2.6
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_ios/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ dev_dependencies:
build_runner: 2.1.11
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
pigeon: ^3.2.5

2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_macos/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ dev_dependencies:
build_runner: ^2.3.2
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
pigeon: ^4.2.14
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_windows/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ dev_dependencies:
build_runner: 2.1.11
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
pigeon: ^3.2.5
2 changes: 1 addition & 1 deletion packages/flutter_markdown/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
standard_message_codec: ^0.0.1+3
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ dev_dependencies:
async: ^2.5.0
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ dev_dependencies:
http: ^0.13.0
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dev_dependencies:
http: ^0.13.0
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2

# The example deliberately includes limited-use secrets.
false_secrets:
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in_web/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ dev_dependencies:
integration_test:
sdk: flutter
js: ^0.6.3
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ dev_dependencies:
cross_file: ^0.3.1+1 # Mockito generates a direct include.
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.0.0
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
pigeon: ^9.1.0
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_ios/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
pigeon: ^3.0.2
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_windows/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ dev_dependencies:
build_runner: ^2.1.5
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ dev_dependencies:
flutter_test:
sdk: flutter
json_serializable: ^6.3.1
mockito: 5.3.2
mockito: ^5.3.2
test: ^1.16.0
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ dev_dependencies:
sdk: flutter
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.1.2
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/metrics_center/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ dependencies:
dev_dependencies:
build_runner: ^2.1.1
fake_async: ^1.2.0
mockito: 5.3.2
mockito: ^5.3.2
test: ^1.17.11
2 changes: 1 addition & 1 deletion packages/path_provider/path_provider_foundation/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ dev_dependencies:
build_runner: ^2.3.2
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
path: ^1.8.0
pigeon: ^5.0.0
2 changes: 1 addition & 1 deletion packages/pigeon/platform_tests/flutter_null_safe_unit_tests/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dev_dependencies:
build_runner: ^2.1.10
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2

flutter:
uses-material-design: true
2 changes: 1 addition & 1 deletion packages/plugin_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies:
meta: ^1.3.0

dev_dependencies:
mockito: 5.3.2
mockito: ^5.3.2
test: ^1.16.0
2 changes: 1 addition & 1 deletion packages/quick_actions/quick_actions/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ dev_dependencies:
sdk: flutter
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.0.0
2 changes: 1 addition & 1 deletion packages/quick_actions/quick_actions_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dev_dependencies:
sdk: flutter
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.0.0

flutter:
Expand Down
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.0.0
test: ^1.16.3
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_android/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dev_dependencies:
sdk: flutter
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.0.0

flutter:
Expand Down
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.0.0
test: ^1.16.3
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_web/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dev_dependencies:
sdk: flutter
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
url_launcher_platform_interface: ^2.0.3
url_launcher_web:
path: ../
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
plugin_platform_interface: ^2.1.3
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
pigeon: ^9.0.4
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter_platform_interface/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ dev_dependencies:
build_runner: ^2.1.8
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter_web/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: ^5.3.2
pigeon: ^4.2.13
2 changes: 1 addition & 1 deletion script/tool/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
dev_dependencies:
build_runner: ^2.0.3
matcher: ^0.12.10
mockito: 5.3.2
mockito: ^5.3.2

environment:
sdk: '>=2.14.0 <4.0.0'