From a150e4838d9265f968437ef5abfb9fc668451c1e Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Mon, 10 May 2021 15:40:13 -0400 Subject: [PATCH] Fix 'publish' and 'test' failures (#346) Enabling the new publishing checks was done in a PR that touched at least one package, so didn't actually run on the whole repo, causing post-submit breakage. This fixes the publish errors: - Corrects a version mismatch in fuchsia_ctl and standardizes the format it uses for listing recent versions. - Removes all pre-release SDK requirements now that null safety is stable. - Fixes a publish warning about the use of 'docs' rather than 'doc' in pigeon. It also fixes the test in error in bsdiff by reverting #342 and fixing it correctly. That change was completely wrong, but CI didn't catch it since it wasn't running any tests for third_party/packages/ yet. --- packages/animations/example/pubspec.yaml | 2 +- packages/animations/pubspec.yaml | 2 +- .../flutter_markdown/example/pubspec.yaml | 2 +- packages/fuchsia_ctl/CHANGELOG.md | 18 +++--------------- packages/fuchsia_ctl/pubspec.yaml | 2 +- packages/multicast_dns/pubspec.yaml | 2 +- packages/pigeon/CONTRIBUTING.md | 2 +- .../pigeon/{docs => doc}/pigeon_state.png | Bin .../pigeon/{docs => doc}/pigeon_state.puml | 0 .../pointer_interceptor/example/pubspec.yaml | 2 +- packages/pointer_interceptor/pubspec.yaml | 2 +- packages/xdg_directories/pubspec.yaml | 2 +- third_party/packages/bsdiff/lib/bsdiff.dart | 8 ++++---- third_party/packages/bsdiff/pubspec.yaml | 3 +-- 14 files changed, 17 insertions(+), 30 deletions(-) rename packages/pigeon/{docs => doc}/pigeon_state.png (100%) rename packages/pigeon/{docs => doc}/pigeon_state.puml (100%) diff --git a/packages/animations/example/pubspec.yaml b/packages/animations/example/pubspec.yaml index ecee1e8085..f5ad6ebfe4 100644 --- a/packages/animations/example/pubspec.yaml +++ b/packages/animations/example/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: none version: 0.0.1 environment: - sdk: ">=2.12.0-259.9.beta <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: animations: diff --git a/packages/animations/pubspec.yaml b/packages/animations/pubspec.yaml index 81150b1c5e..45c4fad463 100644 --- a/packages/animations/pubspec.yaml +++ b/packages/animations/pubspec.yaml @@ -4,7 +4,7 @@ version: 2.0.0 homepage: https://github.com/flutter/packages/tree/master/packages/animations environment: - sdk: '>=2.12.0-259.9.beta <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: diff --git a/packages/flutter_markdown/example/pubspec.yaml b/packages/flutter_markdown/example/pubspec.yaml index 5221a12bea..44eda035b2 100644 --- a/packages/flutter_markdown/example/pubspec.yaml +++ b/packages/flutter_markdown/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Demonstrates how to use the flutter_markdown package. publish_to: "none" environment: - sdk: '>=2.12.0-0 <3.0.0' + sdk: '>=2.12.0 <3.0.0' flutter: ">=1.17.0" dependencies: diff --git a/packages/fuchsia_ctl/CHANGELOG.md b/packages/fuchsia_ctl/CHANGELOG.md index 43716b97d5..c003cf9c3e 100644 --- a/packages/fuchsia_ctl/CHANGELOG.md +++ b/packages/fuchsia_ctl/CHANGELOG.md @@ -1,20 +1,8 @@ -# CHANGELOG - -## version:0.0.27 - -- Flush the content of iosink when writing output to a file. - -## version:0.0.26 - -- Replace amberctl with pkgctl. - -## version:0.0.25 - -- Added log-file option to stream logs to a file. - - ## 0.0.24 +- Flush the content of iosink when writing output to a file. +- Replace amberctl with pkgctl. +- Added log-file option to stream logs to a file. - Use fuchsia sdk `device-finder` instead of `dev_finder`. ## 0.0.23 diff --git a/packages/fuchsia_ctl/pubspec.yaml b/packages/fuchsia_ctl/pubspec.yaml index 9106bb1d0a..14c8585939 100644 --- a/packages/fuchsia_ctl/pubspec.yaml +++ b/packages/fuchsia_ctl/pubspec.yaml @@ -4,7 +4,7 @@ description: > Fuchsia Device. This package is primarily intended for use in Flutter's continuous integration/testing infrastructure. homepage: https://github.com/flutter/packages/tree/master/packages/fuchsia_ctl -version: 0.0.23 +version: 0.0.24 environment: sdk: ">=2.4.0 <3.0.0" diff --git a/packages/multicast_dns/pubspec.yaml b/packages/multicast_dns/pubspec.yaml index 058d0c4b7d..c7c1a7bf4d 100644 --- a/packages/multicast_dns/pubspec.yaml +++ b/packages/multicast_dns/pubspec.yaml @@ -10,4 +10,4 @@ dev_dependencies: test: "^1.16.5" environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" diff --git a/packages/pigeon/CONTRIBUTING.md b/packages/pigeon/CONTRIBUTING.md index d4174c8549..39266c08de 100644 --- a/packages/pigeon/CONTRIBUTING.md +++ b/packages/pigeon/CONTRIBUTING.md @@ -14,7 +14,7 @@ uses `dart:mirrors` to parse the generated file, creating an [AST](https://en.wikipedia.org/wiki/Abstract_syntax_tree), then running code generators with that AST. -![State Diagram](./docs/pigeon_state.png) +![State Diagram](./doc/pigeon_state.png) ## Source Index diff --git a/packages/pigeon/docs/pigeon_state.png b/packages/pigeon/doc/pigeon_state.png similarity index 100% rename from packages/pigeon/docs/pigeon_state.png rename to packages/pigeon/doc/pigeon_state.png diff --git a/packages/pigeon/docs/pigeon_state.puml b/packages/pigeon/doc/pigeon_state.puml similarity index 100% rename from packages/pigeon/docs/pigeon_state.puml rename to packages/pigeon/doc/pigeon_state.puml diff --git a/packages/pointer_interceptor/example/pubspec.yaml b/packages/pointer_interceptor/example/pubspec.yaml index 2ed4117873..317db5ff49 100644 --- a/packages/pointer_interceptor/example/pubspec.yaml +++ b/packages/pointer_interceptor/example/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0 environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" flutter: ">=1.26.0-0" # For integration_test from sdk dependencies: diff --git a/packages/pointer_interceptor/pubspec.yaml b/packages/pointer_interceptor/pubspec.yaml index 5bea65f841..29c7e6cc5a 100644 --- a/packages/pointer_interceptor/pubspec.yaml +++ b/packages/pointer_interceptor/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages version: 0.9.0 environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" flutter: ">=1.17.0" dependencies: diff --git a/packages/xdg_directories/pubspec.yaml b/packages/xdg_directories/pubspec.yaml index 197813e4fe..32ed40e473 100644 --- a/packages/xdg_directories/pubspec.yaml +++ b/packages/xdg_directories/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.2.0 homepage: https://github.com/flutter/packages/tree/master/packages/xdg_directories environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: meta: ^1.3.0 diff --git a/third_party/packages/bsdiff/lib/bsdiff.dart b/third_party/packages/bsdiff/lib/bsdiff.dart index f9b9eb22a5..ce60966c1b 100644 --- a/third_party/packages/bsdiff/lib/bsdiff.dart +++ b/third_party/packages/bsdiff/lib/bsdiff.dart @@ -96,7 +96,7 @@ void _split(List idata, List vdata, int start, int len, int h) { void _qsufsort(List idata, List vdata, Uint8List olddata) { final int oldsize = olddata.length; - final List buckets = [256]; + final List buckets = List.filled(256, 0); for (int i = 0; i < 256; i++) { buckets[i] = 0; @@ -212,8 +212,8 @@ Uint8List bsdiff(List olddata, List newdata) { final int oldsize = olddata.length; final int newsize = newdata.length; - final List idata = [oldsize + 1]; - _qsufsort(idata, [oldsize + 1], olddata); + final List idata = List.filled(oldsize + 1, 0); + _qsufsort(idata, List.filled(oldsize + 1, 0), olddata); final Uint8List db = Uint8List(newsize + 1); final Uint8List eb = Uint8List(newsize + 1); @@ -379,7 +379,7 @@ Uint8List bspatch(List olddata, List diffdata) { int newpos = 0; while (newpos < newsize) { - final List ctrl = [3]; + final List ctrl = List.filled(3, 0); for (int i = 0; i <= 2; i++) { ctrl[i] = cpfdata.getInt64(8 * cpfpos++); } diff --git a/third_party/packages/bsdiff/pubspec.yaml b/third_party/packages/bsdiff/pubspec.yaml index 1472d12381..519f611002 100644 --- a/third_party/packages/bsdiff/pubspec.yaml +++ b/third_party/packages/bsdiff/pubspec.yaml @@ -1,6 +1,5 @@ name: bsdiff description: Binary diff/patch algorithm based on bsdiff by Colin Percival. -author: Flutter Team homepage: https://github.com/flutter/packages/tree/master/third_party/packages/bsdiff version: 0.1.0 @@ -8,4 +7,4 @@ dev_dependencies: test: "^1.3.4" environment: - sdk: ">=2.1.1-dev.2.0 <3.0.0" + sdk: ">=2.1.2 <3.0.0"