From 73a59d63876e9e9488fa35a08c7803bb80876742 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 15 Jan 2021 09:42:27 -0800 Subject: [PATCH 1/4] [camera] Update quiver dep. --- packages/camera/camera/CHANGELOG.md | 4 ++++ packages/camera/camera/pubspec.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md index 66398996e053..d5213193adeb 100644 --- a/packages/camera/camera/CHANGELOG.md +++ b/packages/camera/camera/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.0+6 + +* Update `quiver` to `^3.0.0-nullsafety.2` so this can be used alongside `google_sign_in`. + ## 0.7.0+5 * Fixes crash when taking a picture on iOS devices without flash. diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index 406ff94ab1b9..9d9f2debfb0d 100644 --- a/packages/camera/camera/pubspec.yaml +++ b/packages/camera/camera/pubspec.yaml @@ -2,7 +2,7 @@ name: camera description: A Flutter plugin for getting information about and controlling the camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video, and streaming image buffers to dart. -version: 0.7.0+5 +version: 0.7.0+6 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera dependencies: @@ -10,7 +10,7 @@ dependencies: sdk: flutter camera_platform_interface: ^1.5.0 pedantic: ^1.8.0 - quiver: ^2.1.5 + quiver: ^3.0.0-nullsafety.2 dev_dependencies: path_provider: ^0.5.0 From a68ca05188f993702aafb8912dc7e6d8821af58b Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 15 Jan 2021 13:08:23 -0800 Subject: [PATCH 2/4] Revert "[camera] Update quiver dep." This reverts commit 73a59d63876e9e9488fa35a08c7803bb80876742. --- packages/camera/camera/CHANGELOG.md | 4 ---- packages/camera/camera/pubspec.yaml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md index d5213193adeb..66398996e053 100644 --- a/packages/camera/camera/CHANGELOG.md +++ b/packages/camera/camera/CHANGELOG.md @@ -1,7 +1,3 @@ -## 0.7.0+6 - -* Update `quiver` to `^3.0.0-nullsafety.2` so this can be used alongside `google_sign_in`. - ## 0.7.0+5 * Fixes crash when taking a picture on iOS devices without flash. diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index 9d9f2debfb0d..406ff94ab1b9 100644 --- a/packages/camera/camera/pubspec.yaml +++ b/packages/camera/camera/pubspec.yaml @@ -2,7 +2,7 @@ name: camera description: A Flutter plugin for getting information about and controlling the camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video, and streaming image buffers to dart. -version: 0.7.0+6 +version: 0.7.0+5 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera dependencies: @@ -10,7 +10,7 @@ dependencies: sdk: flutter camera_platform_interface: ^1.5.0 pedantic: ^1.8.0 - quiver: ^3.0.0-nullsafety.2 + quiver: ^2.1.5 dev_dependencies: path_provider: ^0.5.0 From d4c424b942d2c9204478843bfd66c344b45b9202 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 15 Jan 2021 13:33:50 -0800 Subject: [PATCH 3/4] [script] Exclude conflicting non-migrated plugins from building in master. --- script/build_all_plugins_app.sh | 4 ++++ script/nnbd_plugins.sh | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/script/build_all_plugins_app.sh b/script/build_all_plugins_app.sh index ca97c05f8ee4..72390c213da9 100755 --- a/script/build_all_plugins_app.sh +++ b/script/build_all_plugins_app.sh @@ -56,6 +56,10 @@ ALL_EXCLUDED=($EXCLUDED) if [ "$CHANNEL" == "stable" ]; then ALL_EXCLUDED=("$EXCLUDED,$EXCLUDED_PLUGINS_FROM_STABLE") fi +# Exclude non-nnbd plugins from master. +if [ "$CHANNEL" != "stable" ]; then + ALL_EXCLUDED=("$EXCLUDED,$EXCLUDED_PLUGINS_FROM_MASTER") +fi echo "Excluding the following plugins: $ALL_EXCLUDED" diff --git a/script/nnbd_plugins.sh b/script/nnbd_plugins.sh index 7bc5ac35a3a5..51aa59bda1f5 100644 --- a/script/nnbd_plugins.sh +++ b/script/nnbd_plugins.sh @@ -21,4 +21,22 @@ readonly NNBD_PLUGINS_LIST=( "webview_flutter" ) +# This list contains the list of plugins that have *not* been +# migrated to nnbd, and conflict with those that have when +# building the all plugins app. This list should be kept empty. + +readonly NON_NNBD_PLUGINS_LIST=( + # "android_alarm_manager" + "camera" + # "file_selector" + # "google_maps_flutter" + # "image_picker" + # "in_app_purchase" + # "quick_actions" + # "sensors" + # "shared_preferences" + # "wifi_info_flutter" +) + export EXCLUDED_PLUGINS_FROM_STABLE=$(IFS=, ; echo "${NNBD_PLUGINS_LIST[*]}") +export EXCLUDED_PLUGINS_FROM_MASTER=$(IFS=, ; echo "${NON_NNBD_PLUGINS_LIST[*]}") \ No newline at end of file From 01077223ed40aa4ab17066043871b59406dc5bee Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Fri, 15 Jan 2021 14:03:44 -0800 Subject: [PATCH 4/4] Added NL@EOF --- script/nnbd_plugins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/nnbd_plugins.sh b/script/nnbd_plugins.sh index 51aa59bda1f5..b2ca25bf6836 100644 --- a/script/nnbd_plugins.sh +++ b/script/nnbd_plugins.sh @@ -39,4 +39,4 @@ readonly NON_NNBD_PLUGINS_LIST=( ) export EXCLUDED_PLUGINS_FROM_STABLE=$(IFS=, ; echo "${NNBD_PLUGINS_LIST[*]}") -export EXCLUDED_PLUGINS_FROM_MASTER=$(IFS=, ; echo "${NON_NNBD_PLUGINS_LIST[*]}") \ No newline at end of file +export EXCLUDED_PLUGINS_FROM_MASTER=$(IFS=, ; echo "${NON_NNBD_PLUGINS_LIST[*]}")