From 2bf54d9fdb1a515068210c7428ecf8d13579a943 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 2 Feb 2021 12:41:59 -0500 Subject: [PATCH 1/5] Update macOS native-only plugins for NNBD macOS federated plugin implementations that contain no Dart code just need their Dart SDK bumped in order to be considered nullsafe. --- packages/path_provider/path_provider_macos/CHANGELOG.md | 4 ++++ packages/path_provider/path_provider_macos/pubspec.yaml | 4 ++-- .../shared_preferences/shared_preferences_macos/CHANGELOG.md | 4 ++++ .../shared_preferences/shared_preferences_macos/pubspec.yaml | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/path_provider/path_provider_macos/CHANGELOG.md b/packages/path_provider/path_provider_macos/CHANGELOG.md index 1380d76a8f3c..0d39ca4e1fa0 100644 --- a/packages/path_provider/path_provider_macos/CHANGELOG.md +++ b/packages/path_provider/path_provider_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.4+10-nullsafety + +* Update Dart SDK constraint for null safety. + ## 0.0.4+9 * Remove placeholder Dart file. diff --git a/packages/path_provider/path_provider_macos/pubspec.yaml b/packages/path_provider/path_provider_macos/pubspec.yaml index 9d3a3896903e..c435b294f013 100644 --- a/packages/path_provider/path_provider_macos/pubspec.yaml +++ b/packages/path_provider/path_provider_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the path_provider plugin # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.4+9 +version: 0.0.4+10-nullsafety homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_macos flutter: @@ -13,7 +13,7 @@ flutter: pluginClass: PathProviderPlugin environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.10.0" dependencies: diff --git a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md index 3eff6db6949e..e3e9479c36e3 100644 --- a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.1+13-nullsafety + +* Update Dart SDK constraint for null safety. + ## 0.0.1+12 * Update Flutter SDK constraint. diff --git a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml index afc5b9ec0b4e..e89ead1f81b9 100644 --- a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the shared_preferences plugin. # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.1+12 +version: 0.0.1+13-nullsafety homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences_macos flutter: @@ -13,7 +13,7 @@ flutter: pluginClass: SharedPreferencesPlugin environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.12.8" dependencies: From 6a000934b32dd20af64cd9a8c79981d62d2e9b85 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 2 Feb 2021 13:16:15 -0500 Subject: [PATCH 2/5] Remove unnecessary prerelease tags --- packages/path_provider/path_provider_macos/CHANGELOG.md | 2 +- packages/path_provider/path_provider_macos/pubspec.yaml | 2 +- .../shared_preferences/shared_preferences_macos/CHANGELOG.md | 2 +- .../shared_preferences/shared_preferences_macos/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/path_provider/path_provider_macos/CHANGELOG.md b/packages/path_provider/path_provider_macos/CHANGELOG.md index 0d39ca4e1fa0..4de552e3325d 100644 --- a/packages/path_provider/path_provider_macos/CHANGELOG.md +++ b/packages/path_provider/path_provider_macos/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.0.4+10-nullsafety +## 0.0.4+10 * Update Dart SDK constraint for null safety. diff --git a/packages/path_provider/path_provider_macos/pubspec.yaml b/packages/path_provider/path_provider_macos/pubspec.yaml index c435b294f013..ff2fadf6186a 100644 --- a/packages/path_provider/path_provider_macos/pubspec.yaml +++ b/packages/path_provider/path_provider_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the path_provider plugin # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.4+10-nullsafety +version: 0.0.4+10 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_macos flutter: diff --git a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md index e3e9479c36e3..8a3e5a6694a9 100644 --- a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.0.1+13-nullsafety +## 0.0.1+13 * Update Dart SDK constraint for null safety. diff --git a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml index e89ead1f81b9..049b0561e526 100644 --- a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the shared_preferences plugin. # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.1+13-nullsafety +version: 0.0.1+13 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences_macos flutter: From dec7ddff877f41f2ce3a234ef743d1d372272836 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 2 Feb 2021 13:23:20 -0500 Subject: [PATCH 3/5] Re-add prerelease tags There's a warning when publishing with a pre-release SDK requirement, so it fails CI without itself having prerelease tags. --- packages/path_provider/path_provider_macos/CHANGELOG.md | 2 +- packages/path_provider/path_provider_macos/pubspec.yaml | 2 +- .../shared_preferences/shared_preferences_macos/CHANGELOG.md | 2 +- .../shared_preferences/shared_preferences_macos/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/path_provider/path_provider_macos/CHANGELOG.md b/packages/path_provider/path_provider_macos/CHANGELOG.md index 4de552e3325d..0d39ca4e1fa0 100644 --- a/packages/path_provider/path_provider_macos/CHANGELOG.md +++ b/packages/path_provider/path_provider_macos/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.0.4+10 +## 0.0.4+10-nullsafety * Update Dart SDK constraint for null safety. diff --git a/packages/path_provider/path_provider_macos/pubspec.yaml b/packages/path_provider/path_provider_macos/pubspec.yaml index ff2fadf6186a..c435b294f013 100644 --- a/packages/path_provider/path_provider_macos/pubspec.yaml +++ b/packages/path_provider/path_provider_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the path_provider plugin # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.4+10 +version: 0.0.4+10-nullsafety homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_macos flutter: diff --git a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md index 8a3e5a6694a9..e3e9479c36e3 100644 --- a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.0.1+13 +## 0.0.1+13-nullsafety * Update Dart SDK constraint for null safety. diff --git a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml index 049b0561e526..e89ead1f81b9 100644 --- a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the shared_preferences plugin. # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.1+13 +version: 0.0.1+13-nullsafety homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences_macos flutter: From 4a4b2d39973b9ebcb1be79093d7cdc1cfac96f93 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 3 Feb 2021 09:52:55 -0500 Subject: [PATCH 4/5] Revert shared_preferences --- .../shared_preferences/shared_preferences_macos/CHANGELOG.md | 4 ---- .../shared_preferences/shared_preferences_macos/pubspec.yaml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md index e3e9479c36e3..3eff6db6949e 100644 --- a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md @@ -1,7 +1,3 @@ -## 0.0.1+13-nullsafety - -* Update Dart SDK constraint for null safety. - ## 0.0.1+12 * Update Flutter SDK constraint. diff --git a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml index e89ead1f81b9..afc5b9ec0b4e 100644 --- a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the shared_preferences plugin. # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.1+13-nullsafety +version: 0.0.1+12 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences_macos flutter: @@ -13,7 +13,7 @@ flutter: pluginClass: SharedPreferencesPlugin environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.1.0 <3.0.0" flutter: ">=1.12.8" dependencies: From bbf2c2626f91f808bcb8346cba0072bb3e08b316 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 3 Feb 2021 10:35:06 -0500 Subject: [PATCH 5/5] Fix version to be a valid pre-release --- packages/path_provider/path_provider_macos/CHANGELOG.md | 2 +- packages/path_provider/path_provider_macos/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/path_provider/path_provider_macos/CHANGELOG.md b/packages/path_provider/path_provider_macos/CHANGELOG.md index 0d39ca4e1fa0..2f7290c2ced1 100644 --- a/packages/path_provider/path_provider_macos/CHANGELOG.md +++ b/packages/path_provider/path_provider_macos/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.0.4+10-nullsafety +## 0.0.5-nullsafety * Update Dart SDK constraint for null safety. diff --git a/packages/path_provider/path_provider_macos/pubspec.yaml b/packages/path_provider/path_provider_macos/pubspec.yaml index c435b294f013..a2bbd58b7289 100644 --- a/packages/path_provider/path_provider_macos/pubspec.yaml +++ b/packages/path_provider/path_provider_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the path_provider plugin # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.4+10-nullsafety +version: 0.0.5-nullsafety homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_macos flutter: