From aedd3e544bf5fdab3ddda0c25bd00011a3fa9af3 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 3 Jun 2022 19:13:08 -0700 Subject: [PATCH] [flutter_image][ci] ignore deprecation warning, migrate master references to main. (#2199) --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- CONTRIBUTING.md | 2 +- README.md | 4 ++-- .../CHANGELOG.md | 4 ++++ .../README.md | 2 +- .../pubspec.yaml | 2 +- packages/flutter_image/CHANGELOG.md | 4 ++++ packages/flutter_image/lib/network.dart | 9 ++++++++- packages/flutter_image/pubspec.yaml | 2 +- packages/flutter_image/test/network_test.dart | 6 ++++++ packages/pointer_interceptor/CHANGELOG.md | 3 ++- packages/pointer_interceptor/README.md | 4 ++-- packages/pointer_interceptor/pubspec.yaml | 2 +- packages/rfw/CHANGELOG.md | 4 ++++ packages/rfw/example/remote/lib/main.dart | 2 +- packages/rfw/example/wasm/lib/main.dart | 2 +- packages/rfw/lib/rfw.dart | 4 ++-- packages/rfw/pubspec.yaml | 2 +- third_party/packages/cupertino_icons/CHANGELOG.md | 7 ++++++- third_party/packages/cupertino_icons/README.md | 2 +- third_party/packages/cupertino_icons/pubspec.yaml | 2 +- 21 files changed, 52 insertions(+), 21 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f045c4039b70..439aac101b28 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,9 +21,9 @@ If you need help, consider asking for advice on the #hackers-new channel on [Discord]. -[Contributor Guide]: https://github.com/flutter/packages/blob/master/CONTRIBUTING.md +[Contributor Guide]: https://github.com/flutter/packages/blob/main/CONTRIBUTING.md [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene -[relevant style guides]: https://github.com/flutter/packages/blob/master/CONTRIBUTING.md#style +[relevant style guides]: https://github.com/flutter/packages/blob/main/CONTRIBUTING.md#style [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2d9c900a201a..2b46cbd66a9c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to Flutter Packages -[![Build Status](https://api.cirrus-ci.com/github/flutter/packages.svg)](https://cirrus-ci.com/github/flutter/packages/master) +[![Build Status](https://api.cirrus-ci.com/github/flutter/packages.svg)](https://cirrus-ci.com/github/flutter/packages/main) _See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_ diff --git a/README.md b/README.md index e1a0d899abb4..046697fa8fd1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Flutter Packages -[![Build Status](https://api.cirrus-ci.com/github/flutter/packages.svg)](https://cirrus-ci.com/github/flutter/packages/master) +[![Build Status](https://api.cirrus-ci.com/github/flutter/packages.svg)](https://cirrus-ci.com/github/flutter/packages/main) [![Release Status](https://github.com/flutter/packages/actions/workflows/release.yml/badge.svg)](https://github.com/flutter/packages/actions/workflows/release.yml) This repo is a companion repo to the main [flutter repo]( @@ -25,7 +25,7 @@ is ready you can [publish](https://flutter.io/developing-packages/#publish) to the [pub repository](https://pub.dartlang.org/). If you wish to contribute a change to any of the existing packages in this repo, -please review our [contribution guide](https://github.com/flutter/packages/blob/master/CONTRIBUTING.md), +please review our [contribution guide](https://github.com/flutter/packages/blob/main/CONTRIBUTING.md), and send a [pull request](https://github.com/flutter/packages/pulls). ## Packages diff --git a/packages/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md b/packages/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md index f6fa4afb9c61..3a440e91e567 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md +++ b/packages/extension_google_sign_in_as_googleapis_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.5 + +* Updates README to reference the correct github URL. + ## 2.0.4 * Update example with the latest changes from `google_sign_in`, so it builds again on Android. [#89301](https://github.com/flutter/flutter/issues/89301). diff --git a/packages/extension_google_sign_in_as_googleapis_auth/README.md b/packages/extension_google_sign_in_as_googleapis_auth/README.md index f8ea88c3af51..01caf5fc5306 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/README.md +++ b/packages/extension_google_sign_in_as_googleapis_auth/README.md @@ -28,7 +28,7 @@ final response = await peopleApi.people.connections.list( This package contains a modified version of Flutter's Google Sign In example app that uses `package:googleapis`' API clients, instead of raw http requests. -See it [here](https://github.com/flutter/packages/blob/master/packages/extension_google_sign_in_as_googleapis_auth/example/lib/main.dart). +See it [here](https://github.com/flutter/packages/blob/main/packages/extension_google_sign_in_as_googleapis_auth/example/lib/main.dart). The original code (and its license) can be seen [here](https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in/example/lib/main.dart). diff --git a/packages/extension_google_sign_in_as_googleapis_auth/pubspec.yaml b/packages/extension_google_sign_in_as_googleapis_auth/pubspec.yaml index d92058c28b07..fb265e5ecf1b 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/pubspec.yaml +++ b/packages/extension_google_sign_in_as_googleapis_auth/pubspec.yaml @@ -8,7 +8,7 @@ name: extension_google_sign_in_as_googleapis_auth description: A bridge package between google_sign_in and googleapis_auth, to create Authenticated Clients from google_sign_in user credentials. repository: https://github.com/flutter/packages/tree/main/packages/extension_google_sign_in_as_googleapis_auth issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+extension_google_sign_in_as_googleapis_auth%22 -version: 2.0.4 +version: 2.0.5 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/flutter_image/CHANGELOG.md b/packages/flutter_image/CHANGELOG.md index 77ce78e9a397..c59a36194ee2 100644 --- a/packages/flutter_image/CHANGELOG.md +++ b/packages/flutter_image/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.1.3 + +* Suppresses deprecation warnings. + ## 4.1.2 * Migrates from `ui.hash*` to `Object.hash*`. diff --git a/packages/flutter_image/lib/network.dart b/packages/flutter_image/lib/network.dart index fc633dd1a9b6..10e8be8b31e0 100644 --- a/packages/flutter_image/lib/network.dart +++ b/packages/flutter_image/lib/network.dart @@ -96,6 +96,9 @@ class NetworkImageWithRetry extends ImageProvider { } @override + // TODO(cyanglaz): migrate to use the new APIs + // https://github.com/flutter/flutter/issues/105336 + // ignore: deprecated_member_use ImageStreamCompleter load(NetworkImageWithRetry key, DecoderCallback decode) { return OneFrameImageStreamCompleter(_loadWithRetry(key, decode), informationCollector: () sync* { @@ -124,7 +127,11 @@ class NetworkImageWithRetry extends ImageProvider { } Future _loadWithRetry( - NetworkImageWithRetry key, DecoderCallback decode) async { + // TODO(cyanglaz): migrate to use the new APIs + // https://github.com/flutter/flutter/issues/105336 + // ignore: deprecated_member_use + NetworkImageWithRetry key, + DecoderCallback decode) async { assert(key == this); final Stopwatch stopwatch = Stopwatch()..start(); diff --git a/packages/flutter_image/pubspec.yaml b/packages/flutter_image/pubspec.yaml index 99879b7dfcfd..6e8c36240729 100644 --- a/packages/flutter_image/pubspec.yaml +++ b/packages/flutter_image/pubspec.yaml @@ -3,7 +3,7 @@ description: > Image utilities for Flutter: improved network providers, effects, etc. repository: https://github.com/flutter/packages/tree/main/packages/flutter_image issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_image%22 -version: 4.1.2 +version: 4.1.3 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/flutter_image/test/network_test.dart b/packages/flutter_image/test/network_test.dart index 187688f17505..f559ca2645fa 100644 --- a/packages/flutter_image/test/network_test.dart +++ b/packages/flutter_image/test/network_test.dart @@ -142,6 +142,9 @@ void assertThatImageLoadingFails( ) { final ImageStreamCompleter completer = subject.load( subject, + // TODO(cyanglaz): migrate to use the new APIs + // https://github.com/flutter/flutter/issues/105336 + // ignore: deprecated_member_use PaintingBinding.instance.instantiateImageCodec, ); completer.addListener(ImageStreamListener( @@ -159,6 +162,9 @@ void assertThatImageLoadingSucceeds( ) { final ImageStreamCompleter completer = subject.load( subject, + // TODO(cyanglaz): migrate to use the new APIs + // https://github.com/flutter/flutter/issues/105336 + // ignore: deprecated_member_use PaintingBinding.instance.instantiateImageCodec, ); completer.addListener(ImageStreamListener( diff --git a/packages/pointer_interceptor/CHANGELOG.md b/packages/pointer_interceptor/CHANGELOG.md index fcef40b25600..642174c8bd44 100644 --- a/packages/pointer_interceptor/CHANGELOG.md +++ b/packages/pointer_interceptor/CHANGELOG.md @@ -1,7 +1,8 @@ -## NEXT +## 0.9.3+2 * (Temporarily) helps tests introduced in prior version to pass in `stable`. (This will be removed when `master` rolls to `stable`) +* Updates README to reference the correct github URL. ## 0.9.3+1 diff --git a/packages/pointer_interceptor/README.md b/packages/pointer_interceptor/README.md index d51c2bc22bff..6da163fc5d1a 100644 --- a/packages/pointer_interceptor/README.md +++ b/packages/pointer_interceptor/README.md @@ -12,7 +12,7 @@ The result is that Flutter widget's `onTap` (and other) handlers won't fire as e |The problem...| |:-:| -|![Depiction of problematic areas](https://raw.githubusercontent.com/flutter/packages/master/packages/pointer_interceptor/doc/img/affected-areas.png)| +|![Depiction of problematic areas](https://raw.githubusercontent.com/flutter/packages/main/packages/pointer_interceptor/doc/img/affected-areas.png)| |_In the dashed areas, mouse events won't work as expected. The `HtmlElementView` will consume them before Flutter sees them._| @@ -26,7 +26,7 @@ This gives an opportunity to the Flutter framework to handle the click, as expec |The solution...| |:-:| -|![Depiction of the solution](https://raw.githubusercontent.com/flutter/packages/master/packages/pointer_interceptor/doc/img/fixed-areas.png)| +|![Depiction of the solution](https://raw.githubusercontent.com/flutter/packages/main/packages/pointer_interceptor/doc/img/fixed-areas.png)| |_Each `PointerInterceptor` (green) renders between Flutter widgets and the underlying `HtmlElementView`. Mouse events now can't reach the background HtmlElementView, and work as expected._| ## How to use diff --git a/packages/pointer_interceptor/pubspec.yaml b/packages/pointer_interceptor/pubspec.yaml index 2f5d76290b19..e26e12b79230 100644 --- a/packages/pointer_interceptor/pubspec.yaml +++ b/packages/pointer_interceptor/pubspec.yaml @@ -2,7 +2,7 @@ name: pointer_interceptor description: A widget to prevent clicks from being swallowed by underlying HtmlElementViews on the web. repository: https://github.com/flutter/packages/tree/main/packages/pointer_interceptor issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pointer_interceptor%22 -version: 0.9.3+1 +version: 0.9.3+2 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/rfw/CHANGELOG.md b/packages/rfw/CHANGELOG.md index 2bb4c872ab32..94e4c9c2e3af 100644 --- a/packages/rfw/CHANGELOG.md +++ b/packages/rfw/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.5 + +* Fixes URL in document. + ## 1.0.4 * Migrates from `ui.hash*` to `Object.hash*`. diff --git a/packages/rfw/example/remote/lib/main.dart b/packages/rfw/example/remote/lib/main.dart index 7255d42bee4c..f1d5fbeb59bb 100644 --- a/packages/rfw/example/remote/lib/main.dart +++ b/packages/rfw/example/remote/lib/main.dart @@ -11,7 +11,7 @@ import 'package:path/path.dart' as path; import 'package:path_provider/path_provider.dart'; import 'package:rfw/rfw.dart'; -const String urlPrefix = 'https://raw.githubusercontent.com/flutter/packages/master/packages/rfw/example/remote/remote_widget_libraries'; +const String urlPrefix = 'https://raw.githubusercontent.com/flutter/packages/main/packages/rfw/example/remote/remote_widget_libraries'; void main() { runApp(const MaterialApp(home: Example())); diff --git a/packages/rfw/example/wasm/lib/main.dart b/packages/rfw/example/wasm/lib/main.dart index 0c46c21255ae..a0dd80ad9d6d 100644 --- a/packages/rfw/example/wasm/lib/main.dart +++ b/packages/rfw/example/wasm/lib/main.dart @@ -14,7 +14,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:rfw/rfw.dart'; import 'package:wasm/wasm.dart'; -const String urlPrefix = 'https://raw.githubusercontent.com/flutter/packages/master/packages/rfw/example/wasm/logic'; +const String urlPrefix = 'https://raw.githubusercontent.com/flutter/packages/main/packages/rfw/example/wasm/logic'; const String interfaceUrl = '$urlPrefix/calculator.rfw'; const String logicUrl = '$urlPrefix/calculator.wasm'; diff --git a/packages/rfw/lib/rfw.dart b/packages/rfw/lib/rfw.dart index 7f5d37051dde..7e4d92826c66 100644 --- a/packages/rfw/lib/rfw.dart +++ b/packages/rfw/lib/rfw.dart @@ -9,7 +9,7 @@ /// There are many ways to use a package such as this one. In general, the /// approach looks something like this: /// -/// ![The Remote Flutter Widgets comes from the server over the network and into the Runtime. The Runtime also receives the Data model, which is populated both from Client data and from Server data obtained over the network. The Runtime creates Flutter Widgets, which send state updates back to the Runtime, and send user input to the Client logic, which either directly changes the Client data, or sends messages over the network to the Server logic, which then updates the Server data.](https://raw.githubusercontent.com/flutter/packages/master/packages/rfw/images/overview1.png) +/// ![The Remote Flutter Widgets comes from the server over the network and into the Runtime. The Runtime also receives the Data model, which is populated both from Client data and from Server data obtained over the network. The Runtime creates Flutter Widgets, which send state updates back to the Runtime, and send user input to the Client logic, which either directly changes the Client data, or sends messages over the network to the Server logic, which then updates the Server data.](https://raw.githubusercontent.com/flutter/packages/main/packages/rfw/images/overview1.png) /// /// The network aspects of this design are out of scope for this package. Remote /// widget libraries and data should be cached locally, to avoid network issues @@ -19,7 +19,7 @@ /// (e.g. [https://pub.dev/packages/hetu_script](hetu_script)) to run /// remotely-fetched logic locally: /// -/// ![The Remote Flutter Widgets once again come from the server and follow the same path via the network to the Runtime. The Runtime combines this with the Data model to generate the Flutter Widgets, which send state updates directly back to the Runtime and user input to the Hard-coded client logic. That logic updates the Client data which updates the Data model, but also sends messages to the Scripting engine which is also on the Client. The Scripting engine is configured from Scripts obtained over the network, and generates Script data that also populates the Data model.](https://raw.githubusercontent.com/flutter/packages/master/packages/rfw/images/overview2.png) +/// ![The Remote Flutter Widgets once again come from the server and follow the same path via the network to the Runtime. The Runtime combines this with the Data model to generate the Flutter Widgets, which send state updates directly back to the Runtime and user input to the Hard-coded client logic. That logic updates the Client data which updates the Data model, but also sends messages to the Scripting engine which is also on the Client. The Scripting engine is configured from Scripts obtained over the network, and generates Script data that also populates the Data model.](https://raw.githubusercontent.com/flutter/packages/main/packages/rfw/images/overview2.png) /// /// /// ## Using the [RemoteWidget] widget diff --git a/packages/rfw/pubspec.yaml b/packages/rfw/pubspec.yaml index a70bdbc13cb0..6ac9778a3715 100644 --- a/packages/rfw/pubspec.yaml +++ b/packages/rfw/pubspec.yaml @@ -2,7 +2,7 @@ name: rfw description: "Remote Flutter widgets: a library for rendering declarative widget description files at runtime." repository: https://github.com/flutter/packages/tree/main/packages/rfw issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+rfw%22 -version: 1.0.4 +version: 1.0.5 environment: sdk: ">=2.13.0 <3.0.0" diff --git a/third_party/packages/cupertino_icons/CHANGELOG.md b/third_party/packages/cupertino_icons/CHANGELOG.md index 8acd29859df1..49425404fb81 100644 --- a/third_party/packages/cupertino_icons/CHANGELOG.md +++ b/third_party/packages/cupertino_icons/CHANGELOG.md @@ -1,5 +1,10 @@ +## 1.0.5 + +* Updates README to reference correct URL. + ## 1.0.4 -* Update README to link to API docs. + +* Updates README to link to API docs. ## 1.0.3 * Source moved to flutter/packages. diff --git a/third_party/packages/cupertino_icons/README.md b/third_party/packages/cupertino_icons/README.md index df67ed07fbd0..01f6da2b3e49 100644 --- a/third_party/packages/cupertino_icons/README.md +++ b/third_party/packages/cupertino_icons/README.md @@ -25,4 +25,4 @@ For issues, file directly in the [main Flutter repo](https://github.com/flutter/ For a list of all icons, see [`CupertinoIcons` class documentation constants](https://api.flutter.dev/flutter/cupertino/CupertinoIcons-class.html#constants). -For versions 0.1.3 and below, see this [glyph map](https://raw.githubusercontent.com/flutter/packages/master/third_party/packages/cupertino_icons/map.png). +For versions 0.1.3 and below, see this [glyph map](https://raw.githubusercontent.com/flutter/packages/main/third_party/packages/cupertino_icons/map.png). diff --git a/third_party/packages/cupertino_icons/pubspec.yaml b/third_party/packages/cupertino_icons/pubspec.yaml index 9df826c9b028..a66ba8791913 100644 --- a/third_party/packages/cupertino_icons/pubspec.yaml +++ b/third_party/packages/cupertino_icons/pubspec.yaml @@ -3,7 +3,7 @@ name: cupertino_icons description: Default icons asset for Cupertino widgets based on Apple styled icons repository: https://github.com/flutter/packages/tree/main/third_party/packages/cupertino_icons issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+cupertino_icons%22 -version: 1.0.4 +version: 1.0.5 environment: sdk: ">=2.12.0 <3.0.0"