From 56455193072199157564d263f9d2046845a4fd01 Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Fri, 11 Nov 2022 18:23:39 -0800 Subject: [PATCH 1/6] [ios_platform_images] remove deprecated APIs --- packages/ios_platform_images/CHANGELOG.md | 5 +++-- .../lib/ios_platform_images.dart | 16 ++++------------ packages/ios_platform_images/pubspec.yaml | 4 ++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/packages/ios_platform_images/CHANGELOG.md b/packages/ios_platform_images/CHANGELOG.md index 1a28c9b2a550..56c303f1d305 100644 --- a/packages/ios_platform_images/CHANGELOG.md +++ b/packages/ios_platform_images/CHANGELOG.md @@ -1,6 +1,7 @@ -## NEXT +## 0.3.0 -* Updates minimum Flutter version to 2.10. +* Updates minimum Flutter version to 3.3.0. +* Removes usage of deprecated [ImageProvider.load]. * Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/106316). ## 0.2.0+9 diff --git a/packages/ios_platform_images/lib/ios_platform_images.dart b/packages/ios_platform_images/lib/ios_platform_images.dart index fa40eb08fafd..5310c207859f 100644 --- a/packages/ios_platform_images/lib/ios_platform_images.dart +++ b/packages/ios_platform_images/lib/ios_platform_images.dart @@ -3,9 +3,6 @@ // found in the LICENSE file. import 'dart:async'; -// TODO(a14n): remove this import once Flutter 3.1 or later reaches stable (including flutter/flutter#106316) -// ignore: unnecessary_import -import 'dart:typed_data'; import 'dart:ui' as ui; import 'package:flutter/foundation.dart' @@ -64,12 +61,8 @@ class _FutureMemoryImage extends ImageProvider<_FutureMemoryImage> { return SynchronousFuture<_FutureMemoryImage>(this); } - // ignore:deprecated_member_use - /// See [ImageProvider.load]. - // TODO(jmagman): Implement the new API once it lands, https://github.com/flutter/flutter/issues/103556 @override - // ignore: deprecated_member_use - ImageStreamCompleter load(_FutureMemoryImage key, DecoderCallback decode) { + ImageStreamCompleter loadBuffer(_FutureMemoryImage key, DecoderBufferCallback decode) { return _FutureImageStreamCompleter( codec: _loadAsync(key, decode), futureScale: _futureScale, @@ -78,13 +71,12 @@ class _FutureMemoryImage extends ImageProvider<_FutureMemoryImage> { Future _loadAsync( _FutureMemoryImage key, - // ignore: deprecated_member_use - DecoderCallback decode, + DecoderBufferCallback decode, ) async { assert(key == this); return _futureBytes.then((Uint8List bytes) { - return decode(bytes); - }); + return ui.ImmutableBuffer.fromUint8List(bytes); + }).then(decode); } /// See [ImageProvider.operator==]. diff --git a/packages/ios_platform_images/pubspec.yaml b/packages/ios_platform_images/pubspec.yaml index 8b32b39343a7..2f0148503533 100644 --- a/packages/ios_platform_images/pubspec.yaml +++ b/packages/ios_platform_images/pubspec.yaml @@ -2,11 +2,11 @@ name: ios_platform_images description: A plugin to share images between Flutter and iOS in add-to-app setups. repository: https://github.com/flutter/plugins/tree/main/packages/ios_platform_images issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+ios_platform_images%22 -version: 0.2.0+9 +version: 0.3.0 environment: sdk: ">=2.14.0 <3.0.0" - flutter: ">=2.10.0" + flutter: ">=3.3.0" flutter: plugin: From 43d68fe7c159bdc46d48ea96e3895015a9485fef Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Fri, 11 Nov 2022 18:50:04 -0800 Subject: [PATCH 2/6] ++ --- packages/ios_platform_images/lib/ios_platform_images.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ios_platform_images/lib/ios_platform_images.dart b/packages/ios_platform_images/lib/ios_platform_images.dart index 5310c207859f..371ace619474 100644 --- a/packages/ios_platform_images/lib/ios_platform_images.dart +++ b/packages/ios_platform_images/lib/ios_platform_images.dart @@ -62,7 +62,8 @@ class _FutureMemoryImage extends ImageProvider<_FutureMemoryImage> { } @override - ImageStreamCompleter loadBuffer(_FutureMemoryImage key, DecoderBufferCallback decode) { + ImageStreamCompleter loadBuffer( + _FutureMemoryImage key, DecoderBufferCallback decode) { return _FutureImageStreamCompleter( codec: _loadAsync(key, decode), futureScale: _futureScale, From 47df7942e84fc78adbcd23cefedecc506581f67e Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Fri, 11 Nov 2022 18:51:04 -0800 Subject: [PATCH 3/6] ++ --- packages/ios_platform_images/lib/ios_platform_images.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/ios_platform_images/lib/ios_platform_images.dart b/packages/ios_platform_images/lib/ios_platform_images.dart index 371ace619474..c5bd70cad4e3 100644 --- a/packages/ios_platform_images/lib/ios_platform_images.dart +++ b/packages/ios_platform_images/lib/ios_platform_images.dart @@ -75,9 +75,7 @@ class _FutureMemoryImage extends ImageProvider<_FutureMemoryImage> { DecoderBufferCallback decode, ) async { assert(key == this); - return _futureBytes.then((Uint8List bytes) { - return ui.ImmutableBuffer.fromUint8List(bytes); - }).then(decode); + return _futureBytes.then(ui.ImmutableBuffer.fromUint8List).then(decode); } /// See [ImageProvider.operator==]. From e881ad54c73efc4c9f97b1f821311210bd6c3925 Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Fri, 11 Nov 2022 18:51:44 -0800 Subject: [PATCH 4/6] ++ --- packages/ios_platform_images/lib/ios_platform_images.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ios_platform_images/lib/ios_platform_images.dart b/packages/ios_platform_images/lib/ios_platform_images.dart index c5bd70cad4e3..aeb875ad2463 100644 --- a/packages/ios_platform_images/lib/ios_platform_images.dart +++ b/packages/ios_platform_images/lib/ios_platform_images.dart @@ -73,7 +73,7 @@ class _FutureMemoryImage extends ImageProvider<_FutureMemoryImage> { Future _loadAsync( _FutureMemoryImage key, DecoderBufferCallback decode, - ) async { + ) { assert(key == this); return _futureBytes.then(ui.ImmutableBuffer.fromUint8List).then(decode); } From 14c4eb6eb0d39e4eedb31a6882230ab4f56c6a3b Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Tue, 15 Nov 2022 08:43:08 -0800 Subject: [PATCH 5/6] Update pubspec.yaml --- packages/ios_platform_images/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ios_platform_images/pubspec.yaml b/packages/ios_platform_images/pubspec.yaml index 2f0148503533..17fb8850ac1d 100644 --- a/packages/ios_platform_images/pubspec.yaml +++ b/packages/ios_platform_images/pubspec.yaml @@ -2,7 +2,7 @@ name: ios_platform_images description: A plugin to share images between Flutter and iOS in add-to-app setups. repository: https://github.com/flutter/plugins/tree/main/packages/ios_platform_images issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+ios_platform_images%22 -version: 0.3.0 +version: 0.2.1 environment: sdk: ">=2.14.0 <3.0.0" From 375df06adc0bfba8873358de9b6564bd177fdb5a Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Tue, 15 Nov 2022 08:43:23 -0800 Subject: [PATCH 6/6] Update CHANGELOG.md --- packages/ios_platform_images/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ios_platform_images/CHANGELOG.md b/packages/ios_platform_images/CHANGELOG.md index 56c303f1d305..610c362a00db 100644 --- a/packages/ios_platform_images/CHANGELOG.md +++ b/packages/ios_platform_images/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.3.0 +## 0.2.1 * Updates minimum Flutter version to 3.3.0. * Removes usage of deprecated [ImageProvider.load].