Skip to content
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

cherrypick 38e49bd to v0.19.0 #924

Merged
merged 6 commits into from
Apr 12, 2023
Merged

cherrypick 38e49bd to v0.19.0 #924

merged 6 commits into from
Apr 12, 2023

Conversation

dklassic
Copy link
Contributor

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Docs
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change?

  • Yes
  • No

Checklist

  • This PR will resolve #___
  • A change file is added if any packages will require a version bump due to this PR per the instructions in the readme.
  • I have added a convincing reason for adding this feature, if necessary
  • It can be built on all targets and pass CI/CD.

Other information

  • cherrypicked 38e49bd
  • wry: minor changed to wry: patch

JonasKruckenberg and others added 2 commits April 12, 2023 12:23
* feat: add `.url()`to access the current url

* fmt

* add url import

* fix linux and windows

* add stub to android webview

* Update src/webview/webview2/mod.rs

Co-authored-by: Amr Bashir <[email protected]>

* Add android

* change file and doc

Co-authored-by: Amr Bashir <[email protected]>
# Conflicts:
#	src/webview/android/main_pipe.rs
#	src/webview/android/mod.rs
#	src/webview/webkitgtk/mod.rs
@dklassic dklassic requested a review from a team as a code owner April 12, 2023 04:28
@dklassic dklassic changed the base branch from dev to v0.19.0 April 12, 2023 04:29
@dklassic dklassic marked this pull request as draft April 12, 2023 04:36
@dklassic dklassic marked this pull request as ready for review April 12, 2023 04:40
src/webview/android/mod.rs Outdated Show resolved Hide resolved
@dklassic dklassic marked this pull request as draft April 12, 2023 05:03
@dklassic dklassic marked this pull request as ready for review April 12, 2023 11:44
@dklassic dklassic requested a review from wusyong April 12, 2023 11:44
@wusyong wusyong merged commit 01e89ef into v0.19.0 Apr 12, 2023
@wusyong wusyong deleted the 0.19.0_wry_cherrypick branch April 12, 2023 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants