Commit 9fca7cf
committed
Merge branch 'main' into quick_action/subtitle
* main: (64 commits)
[quick_actions_plaform_interface] add localizedSubtitle (flutter#8112)
[tools] Don't check license of generated Swift package (flutter#8137)
Roll Flutter from 8536b96 to 93d772c (37 revisions) (flutter#8147)
[go_router] Fix: Consistent PopScope Handling on Root Routes issue #140869 (flutter#8045)
[in_app_purchase_storekit] fix price displayed with wrong precision (flutter#8127)
[pigeon] Removes the `@protected` annotation from the InstanceManager field of the `PigeonInternalProxyApiBaseClass` (flutter#8125)
[google_maps_flutter] Use structured Pigeon data on iOS (flutter#8142)
[vector_graphics] handle errors from bytes loader (flutter#8080)
[flutter_svg] Fix SvgNetworkLoader not closing internal http client (flutter#8126)
[video_player_avfoundation] send video load failure even when eventsink was initialized late (flutter#7194)
[flutter_markdown] enable Wasm support (flutter#8120)
Reverts "[url_launcher] Add Swift Package Manager integration to example app (flutter#8128)" (flutter#8136)
[url_launcher] Add Swift Package Manager integration to example app (flutter#8128)
[pigeon] Enable example app build in CI (flutter#8119)
[in_app_purchase_storekit] disallow ios versions lower than supported from enabling storekit (flutter#8110)
[interactive_media_ads]: Bump com.google.ads.interactivemedia.v3:interactivemedia from 3.35.1 to 3.36.0 in /packages/interactive_media_ads/android (flutter#8046)
[interactive_media_ads]: Bump androidx.annotation:annotation from 1.8.2 to 1.9.1 in /packages/interactive_media_ads/android (flutter#7980)
[webview_flutter_android] Updates plugin to use `ProxyApis`s (flutter#7794)
[interactive_media_ads] Adds support to define parameters that control the rendering of ads (flutter#8057)
Roll Flutter from b3818f6 to 8536b96 (22 revisions) (flutter#8124)
...
# Conflicts:
# packages/quick_actions/quick_actions_platform_interface/CHANGELOG.md446 files changed
Lines changed: 26696 additions & 27608 deletions
File tree
- .ci
- targets
- .github
- packages
- animations/example
- android
- app
- src
- debug
- main
- kotlin/dev/flutter/packages/animations/example
- res
- drawable-v21
- values-night
- values
- profile
- gradle/wrapper
- camera
- camera_android_camerax
- camera_windows
- windows
- test
- espresso
- android
- example/android
- app
- extension_google_sign_in_as_googleapis_auth/example/android
- app
- src/main
- file_selector
- file_selector_android
- android
- file_selector_linux
- linux
- test
- flutter_image/example/android
- app
- flutter_markdown
- example/android
- app
- lib/src
- go_router
- doc
- example
- android
- app
- src/main
- lib
- others
- test
- lib/src
- test
- google_identity_services_web
- example/integration_test
- lib/src
- js_interop
- test
- google_maps_flutter
- google_maps_flutter_android
- example/android
- app
- test
- google_maps_flutter_ios
- example/ios14/ios/RunnerTests
- ios/Classes
- lib/src
- pigeons
- test
- google_maps_flutter
- example/android
- app
- src/main
- lib
- src
- image_picker
- image_picker_android/example/android
- app
- image_picker/example/android
- app
- src/main
- in_app_purchase
- in_app_purchase_android
- example/android
- app
- in_app_purchase_storekit
- darwin/Classes
- Protocols
- StoreKit2
- example
- lib
- lib/src
- store_kit_2_wrappers
- store_kit_wrappers
- types
- pigeons
- test
- fakes
- store_kit_wrappers
- in_app_purchase/example/android
- app
- src/main
- interactive_media_ads
- android
- src
- main/kotlin/dev/flutter/packages/interactive_media_ads
- test/kotlin/dev/flutter/packages/interactive_media_ads
- example
- android
- lib
- ios/interactive_media_ads/Sources/interactive_media_ads
- lib
- src
- android
- ios
- platform_interface
- pigeons
- test
- android
- ios
- local_auth
- local_auth_android/example/android
- app
- local_auth/example/android
- app
- src/main
- pigeon
- example
- app
- android/app/src/main/kotlin/dev/flutter/pigeon_example_app
- ios/Runner
- linux
- macos/Runner
- windows/runner
- lib
- dart
- platform_tests
- test_plugin
- android
- linux/pigeon
- test
- dart
- quick_actions
- quick_actions_android/example/android
- app
- quick_actions_platform_interface
- quick_actions/example/android
- app
- src/main
- rfw/example
- hello/android
- app
- src/main
- local/android
- app
- src/main
- remote/android
- app
- src/main
- url_launcher
- url_launcher_android/example/android
- app
- url_launcher_linux
- lib/src
- linux
- test
- url_launcher/example/android
- app
- src/main
- vector_graphics_compiler
- lib/src/svg
- test
- vector_graphics
- lib/src
- test
- video_player
- video_player_android
- example/android
- app
- video_player_avfoundation
- darwin
- RunnerTests
- video_player_avfoundation/Sources/video_player_avfoundation
- video_player/example/android
- app
- src/main
- web_benchmarks
- lib/src
- webview_flutter
- webview_flutter_android
- android
- src
- main/java/io/flutter/plugins/webviewflutter
- test/java
- android/net
- io/flutter/plugins/webviewflutter
- example
- android
- app/src/androidTest/java/io/flutter/plugins/webviewflutterexample
- integration_test
- lib/src
- legacy
- pigeons
- test
- legacy
- webview_flutter_web
- webview_flutter_wkwebview
- webview_flutter/example/android
- script/tool
- lib/src
- test
- third_party/packages/flutter_svg
- example/android
- app
- lib/src
- test
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
5 | 12 | | |
6 | 13 | | |
7 | 14 | | |
| |||
0 commit comments