Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[google_maps_flutter_web] Downgrade mockito in example app. #3679

Merged
ditman merged 1 commit into from
Mar 5, 2021
Merged

[google_maps_flutter_web] Downgrade mockito in example app. #3679

ditman merged 1 commit into from
Mar 5, 2021

Conversation

@ditman
Copy link
Member

@ditman ditman commented Mar 5, 2021

Mockito 5 + integration_test from SDK in stable are not compatible:

google_maps_flutter_web/example$ flutter analyze

Because every version of integration_test from sdk depends on crypto 2.1.5 and analyzer >=1.0.0 depends on crypto ^3.0.0, integration_test from sdk is incompatible with analyzer >=1.0.0.
And because mockito 5.0.0 depends on analyzer ^1.0.0 and no versions of mockito match >5.0.0 <6.0.0, integration_test from sdk is incompatible with mockito ^5.0.0.
So, because google_maps_flutter_web_integration_tests depends on both mockito ^5.0.0 and integration_test any from sdk, version solving failed.

Running "flutter pub get" in example...                                 

pub get failed (1; So, because google_maps_flutter_web_integration_tests depends on both mockito ^5.0.0 and integration_test any from sdk, version solving failed.)

This is now apparent because the minimum flutter version that we have for "the next stable after 3/3" is ">=1.27.0", however we're now in "2.0.0" (so it passes, when it shouldn't. We now really mean ">=2.1.0", but that'd break CI in stable as well).

This PR downgrades the mockito dependency so it's compatible with the integration_test package that lives in the stable version of the SDK.

Testing

  • Ran tests, flutter analyze and flutter build web both in stable and master channels

Pre-launch Checklist

  • The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
  • I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy.
  • I updated CHANGELOG.md to add a description of the change.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@google-cla google-cla bot added the cla: yes label Mar 5, 2021
@ditman
Copy link
Member Author

ditman commented Mar 5, 2021

This will have to be merged in red, to fix the submit-queue.

cyanglaz
cyanglaz approved these changes Mar 5, 2021
View reviewed changes
Copy link
Contributor

@cyanglaz cyanglaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming other pre submit tasks pass

@ditman
Copy link
Member Author

ditman commented Mar 5, 2021

@cyanglaz this is a good sign: https://cirrus-ci.com/task/4659104154124288?command=main#L68

@stuartmorgan-g
Copy link
Contributor

stuartmorgan-g commented Mar 5, 2021

We have a bunch of other plugins using 5.0.0; maybe this should be ">=4.1.4 <6.0.0" to minimize conflicts?

@stuartmorgan-g
Copy link
Contributor

stuartmorgan-g commented Mar 5, 2021

(But LGTM either way)

@ditman
Copy link
Member Author

ditman commented Mar 5, 2021 •
edited
Loading

We have a bunch of other plugins using 5.0.0; maybe this should be ">=4.1.4 <6.0.0" to minimize conflicts?

@stuartmorgan this is a dev_dependencies of the example package, I hope it doesn't matter (?) The problem seems to be the interaction between mockito 5 + integration_test in flutter 2.0 (it seems we don't have that combo elsewhere)

@ditman ditman merged commit eb86dfc into flutter:master Mar 5, 2021
@ditman
Copy link
Member Author

ditman commented Mar 5, 2021

Merging to make tree green again

@ditman ditman deleted the downgrade-maps-web-example-mockito branch March 5, 2021 02:26
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Mar 5, 2021
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 5, 2021
@engine-flutter-autoroll
eb86dfc [google_maps_flutter_web] Downgrade mockito in example app. (f…
9605f21 
…lutter/plugins#3679)
fluttergithubbot pushed a commit to flutter/flutter that referenced this pull request Mar 5, 2021
@engine-flutter-autoroll
eb86dfc [google_maps_flutter_web] Downgrade mockito in example app. (f…
fcc0042 
…lutter/plugins#3679) (#77314)
NickalasB added a commit to NickalasB/plugins that referenced this pull request Mar 8, 2021
@NickalasB
Merge branch 'master' into add_zoom_to_android_webview
fc41c1e 
* master:
  [google_sign_in] fix test(flutter#3690)
  [extension_google_sign_in_as_googleapis_auth] Update import (flutter#3689)
  [google_sign_in] Updates google_sign_in_platform_interfaces adding parametrized `clientId` (flutter#3686)
  Import flutter_test for future compatibility (flutter#3665)
  [ci] Disable analyze on stable for web plugins that contains null safety integration tests.  (flutter#3681)
  Bring HTML inputs into view automatically (flutter#3655)
  [in_app_purchase] presentCodeRedemptionSheet (flutter#3274)
  [google_maps_flutter_web] Downgrade mockito in example app. (flutter#3679)
  Update CI config for Flutter 2 (flutter#3674)
  [image_picker] fix flutter/flutter#71927 (flutter#3676)
  [google_maps_flutter_web] Move integration tests to example. (flutter#3675)
  [google_maps_flutter_web] Make google_maps_flutter_web work with latest plugins  (flutter#3673)

# Conflicts:
#	packages/webview_flutter/CHANGELOG.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@stuartmorgan-g stuartmorgan-g Awaiting requested review from stuartmorgan-g

1 more reviewer

@cyanglaz cyanglaz cyanglaz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes p: google_maps_flutter platform-web

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ditman @stuartmorgan-g @cyanglaz