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

[shared_preferences_linux] update file package dep version to be compatible with framework #2950

Merged
cyanglaz merged 3 commits into from
Aug 22, 2020
Merged

[shared_preferences_linux] update file package dep version to be compatible with framework #2950

cyanglaz merged 3 commits into from
Aug 22, 2020

Conversation

@cyanglaz
Copy link
Contributor

@cyanglaz cyanglaz commented Aug 21, 2020 •
edited
Loading

Description

Fix the file package dep conflict caused by flutter/flutter@04f7c9d

Steps of landing PRs and fix post submit tree:

  1. Land this PR on red
    • Ignore CI failures related to version conflicts on shared_preference
    • Ignore Submit Queue failure
  2. Post-submit CI will fail on android_intent and shared_preference about dep conflicts, ignore them.
  3. Publish shared_preferences_linux.
  4. Rerun pre-submit CI of [android_intent] fix platform package dep #2948, should see everything passing.
  5. Land [android_intent] fix platform package dep #2948 with only the Submit Queue failure.
  6. Should see post submit ci passing
  7. Publish android_intent plugin

Related Issues

ci

Checklist

Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes ([x]). This will ensure a smooth and quick review process.

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • My PR includes unit or integration tests for all changed/updated/fixed behaviors (See Contributor Guide).
  • All existing and new tests are passing.
  • I updated/added relevant documentation (doc comments with ///).
  • The analyzer (flutter analyze) does not report any problems on my PR.
  • I read and followed the Flutter Style Guide.
  • The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
  • 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 signed the CLA.
  • I am willing to follow-up on review comments in a timely manner.

Breaking Change

Does your PR require plugin users to manually update their apps to accommodate your change?

  • Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
  • No, this is not a breaking change.

@cyanglaz
Copy link
Contributor Author

cyanglaz commented Aug 21, 2020

This pr will have to be landed on red to resolve ci issues.

stuartmorgan-g
stuartmorgan-g approved these changes Aug 21, 2020
View reviewed changes
packages/shared_preferences/shared_preferences_linux/pubspec.yaml Outdated

dependencies:
file: ^5.1.0
file: ">=5.1.0 < 7.0.0"
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Aug 21, 2020

Choose a reason for hiding this comment

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

Nit: the flutter dependency above attaches the < to the number, and the >= is attached to the number in both places; shouldn't this < be consistent?

Copy link
Contributor Author

@cyanglaz cyanglaz Aug 21, 2020

Choose a reason for hiding this comment

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

you are right. fixed

packages/shared_preferences/shared_preferences_linux/pubspec.yaml Outdated

dependencies:
file: ^5.1.0
file: ">=5.1.0 < 7.0.0"
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Aug 21, 2020

Choose a reason for hiding this comment

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

I assume this is <7 rather than something like ^6.0.0 because of the use of a dev version on the 6.0.0?

Copy link
Contributor Author

@cyanglaz cyanglaz Aug 21, 2020

Choose a reason for hiding this comment

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

yep

@cyanglaz cyanglaz mentioned this pull request Aug 21, 2020
Merged
13 tasks
@cyanglaz
Copy link
Contributor Author

cyanglaz commented Aug 21, 2020

@fkorotkov Seeing some weird timeout on flutter pub get, do you have any idea? The same build works for me locally.

@fkorotkov
Copy link
Contributor

fkorotkov commented Aug 21, 2020

@cyanglaz that's weird that both Linux and macOS tasks failed with the same issue. They are running in completely different infrastructures which elements network issue on Cirrus side. Does flutter pub get has a timeout on it's own? Or can it produce some progress to see where it stuck?

@bparrishMines
Copy link
Contributor

bparrishMines commented Aug 21, 2020

@cyanglaz I believe this issue is that shared_preferences can't successfully run flutter pub get until shared_preferences_linux publishes its latest version and this line is updated.

@cyanglaz
Copy link
Contributor Author

cyanglaz commented Aug 22, 2020

Looks like depending on local shared_preference_linux passed the flutter pub get timeout. I'm still not sure why, but it looks like we can force push this commit and the tree can be fixed by publishing the new shared_preference_linux.

@cyanglaz cyanglaz force-pushed the shared_preference_linux branch from 33b2216 to 249af09 Compare August 22, 2020 02:29
@cyanglaz cyanglaz merged commit 4360a23 into flutter:master Aug 22, 2020
@cyanglaz cyanglaz deleted the shared_preference_linux branch August 22, 2020 02:39
KevinTheGray added a commit to KevinTheGray/plugins that referenced this pull request Aug 31, 2020
@KevinTheGray
Merge branch 'master' into kg-connectivity-ios-permissions
c2732ba 
* master:
  [url_launcher, url_launcher_web]Added webOnlyWindowName parameter to launch()  (flutter#2979)
  [battery_platform_interface] Introduce package. (flutter#2975)
  [url_launcher_platform_interface] Add webOnlyWindowName parameter to launch() (flutter#2974)
  [share] Add sharing file support (android & ios) (flutter#970)
  [integration_test] add support to get timeline (flutter#2947)
  [battery] Moved battery to its own subdir (flutter#2969)
  [integration_test] Fix channel name for iOS, docs (flutter#2972)
  [integration_test] Show stack trace of widget test errors on the platform side (flutter#2967)
  [video_player] Fix `setWithOthers` test (flutter#2970)
  [video_player_platform_interface] fix `setMixIWithOthers` test channel (flutter#2968)
  Add README instructions for enablePendingPurchases (flutter#2921)
  Rebase previous commits (flutter#2966)
  Avoid walleye 26
  Updating documentation to use isEmpty check. (flutter#2955)
  [integration_test] Minor cleanup (flutter#2956)
  [path_provider, video_player] Tweak pubspecs to pass bulk analysis. (flutter#2959)
  [android_intent] fix platform package dep (flutter#2948)
  [shared_preferences_linux] update `file` package dep version to be compatible with framework (flutter#2950)
jorgefspereira pushed a commit to jorgefspereira/plugins_flutter that referenced this pull request Oct 10, 2020
@jorgefspereira
[shared_preferences_linux] update file package dep version to be co…
fbab01a 
…mpatible with framework (flutter#2950)
FlutterSu pushed a commit to FlutterSu/flutter-plugins that referenced this pull request Nov 20, 2020
[shared_preferences_linux] update file package dep version to be co…
9306d2d 
…mpatible with framework (flutter#2950)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@stuartmorgan-g stuartmorgan-g stuartmorgan-g approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@cyanglaz @fkorotkov @bparrishMines @stuartmorgan-g @googlebot