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

Roll mockito to 5.4.0 #3544

Show file tree
Hide file tree
Changes from 8 commits
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
1 change: 1 addition & 0 deletions packages/camera/camera/CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions packages/file_selector/file_selector_ios/CHANGELOG.md
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions packages/file_selector/file_selector_ios/example/pubspec.yaml
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions packages/file_selector/file_selector_macos/CHANGELOG.md
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions packages/file_selector/file_selector_macos/example/pubspec.yaml
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions packages/file_selector/file_selector_windows/CHANGELOG.md
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions packages/file_selector/file_selector_windows/example/pubspec.yaml
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions packages/flutter_markdown/CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions 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 @@ -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
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates minimum Flutter version to 3.3.

## 0.4.0+7

* Clarifies explanation of endorsement in README.
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -3,8 +3,8 @@ publish_to: none

# Tests require flutter beta or greater to run.
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 @@ -25,4 +25,4 @@ dev_dependencies:
http: ^0.13.0
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
4 changes: 2 additions & 2 deletions packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
View file
Open in desktop
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.4.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 Down
1 change: 1 addition & 0 deletions packages/google_sign_in/google_sign_in/CHANGELOG.md
View file
Open in desktop
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.

## 6.0.2
Expand Down
4 changes: 2 additions & 2 deletions packages/google_sign_in/google_sign_in/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: Example of Google Sign-In 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:
flutter:
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -6,8 +6,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 6.0.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 Down Expand Up @@ -36,7 +36,7 @@ dev_dependencies:
http: ^0.13.0
integration_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0

# The example deliberately includes limited-use secrets.
false_secrets:
Expand Down
1 change: 1 addition & 0 deletions packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md
View file
Open in desktop
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.3.1
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -7,8 +7,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 2.3.1

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 @@ -19,4 +19,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.3.2
mockito: 5.4.0
4 changes: 4 additions & 0 deletions packages/google_sign_in/google_sign_in_web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates minimum Flutter version to 3.3.

## 0.11.0+2

* Clarifies explanation of endorsement in README.
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -2,8 +2,8 @@ name: google_sign_in_web_integration_tests
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 All @@ -23,4 +23,4 @@ dev_dependencies:
integration_test:
sdk: flutter
js: ^0.6.3
mockito: 5.3.2
mockito: 5.4.0
4 changes: 2 additions & 2 deletions packages/google_sign_in/google_sign_in_web/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 0.11.0+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 Down
4 changes: 4 additions & 0 deletions packages/image_picker/image_picker/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates minimum Flutter version to 3.3.

## 0.8.7+1

* Updates README to use code excerpts.
Expand Down
4 changes: 2 additions & 2 deletions packages/image_picker/image_picker/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: Demonstrates how to use the image_picker 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:
flutter:
Expand Down
Loading