[roll] Update third-party dart packages
Updated:
Change-Id: I2f5cd4dfabd6972b57d0bc2a1e8247b788479785
diff --git a/connectivity/BUILD.gn b/connectivity/BUILD.gn
index cec2711..fbc1fcf 100644
--- a/connectivity/BUILD.gn
+++ b/connectivity/BUILD.gn
@@ -1,4 +1,4 @@
-# This file is generated by importer.py for connectivity-0.4.5+2
+# This file is generated by importer.py for connectivity-0.4.5+3
import("//build/dart/dart_library.gni")
diff --git a/connectivity/CHANGELOG.md b/connectivity/CHANGELOG.md
index 1248200..5a7b5f7 100644
--- a/connectivity/CHANGELOG.md
+++ b/connectivity/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5+3
+
+* Remove AndroidX warnings.
+
## 0.4.5+2
* Include lifecycle dependency as a compileOnly one on Android to resolve
diff --git a/connectivity/android/build.gradle b/connectivity/android/build.gradle
index a562f60..26ca50c 100644
--- a/connectivity/android/build.gradle
+++ b/connectivity/android/build.gradle
@@ -1,16 +1,3 @@
-def PLUGIN = "connectivity";
-def ANDROIDX_WARNING = "flutterPluginsAndroidXWarning";
-gradle.buildFinished { buildResult ->
- if (buildResult.failure && !rootProject.ext.has(ANDROIDX_WARNING)) {
- println ' *********************************************************'
- println 'WARNING: This version of ' + PLUGIN + ' will break your Android build if it or its dependencies aren\'t compatible with AndroidX.'
- println ' See https://goo.gl/CP92wY for more information on the problem and how to fix it.'
- println ' This warning prints for all Android build failures. The real root cause of the error may be unrelated.'
- println ' *********************************************************'
- rootProject.ext.set(ANDROIDX_WARNING, true);
- }
-}
-
group 'io.flutter.plugins.connectivity'
version '1.0-SNAPSHOT'
diff --git a/connectivity/pubspec.yaml b/connectivity/pubspec.yaml
index 42c9641..4466c7e 100644
--- a/connectivity/pubspec.yaml
+++ b/connectivity/pubspec.yaml
@@ -3,7 +3,7 @@
mobile/cellular) connectivity on Android and iOS.
author: Flutter Team <flutter-dev@googlegroups.com>
homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.5+2
+version: 0.4.5+3
flutter:
plugin:
diff --git a/devtools/BUILD.gn b/devtools/BUILD.gn
index 9e8478c..60f6dcf 100644
--- a/devtools/BUILD.gn
+++ b/devtools/BUILD.gn
@@ -1,4 +1,4 @@
-# This file is generated by importer.py for devtools-0.1.10
+# This file is generated by importer.py for devtools-0.1.11
import("//build/dart/dart_library.gni")
diff --git a/devtools/CHANGELOG.md b/devtools/CHANGELOG.md
index 303cbcc..d240832 100644
--- a/devtools/CHANGELOG.md
+++ b/devtools/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.1.11 - 2019-11-08
+* Add full timeline mode with support for async and recorded tracing.
+* Add event summary section that shows metadata for non-ui events on the Timeline page.
+* Enable full timeline for Dart CLI applications.
+* Fix a message manager bug.
+* Fix a bug with processing CPU profile responses.
+* Reduce race conditions in integration tests.
+
## 0.1.10 - 2019-10-18
* Change wording of DevTools survey prompt.
diff --git a/devtools/build/.build.manifest b/devtools/build/.build.manifest
index 798249d..3c3d1b5 100644
--- a/devtools/build/.build.manifest
+++ b/devtools/build/.build.manifest
@@ -1,4 +1,5 @@
.packages
+debugger_screen.html
devtools_analytics.js
favicon.png
icons/actions/forceRefresh.png
diff --git a/devtools/build/pack/$sdk/_internal/ddc_sdk.sum b/devtools/build/pack/$sdk/_internal/ddc_sdk.sum
index e403fee..b859c20 100644
--- a/devtools/build/pack/$sdk/_internal/ddc_sdk.sum
+++ b/devtools/build/pack/$sdk/_internal/ddc_sdk.sum
Binary files differ
diff --git a/devtools/build/pack/$sdk/_internal/strong.sum b/devtools/build/pack/$sdk/_internal/strong.sum
index 8fbb1dc..4892cff 100644
--- a/devtools/build/pack/$sdk/_internal/strong.sum
+++ b/devtools/build/pack/$sdk/_internal/strong.sum
Binary files differ
diff --git a/devtools/build/pack/flutter/analysis_options_user.yaml b/devtools/build/pack/flutter/analysis_options_user.yaml
index 8fc7857..62e11df 100644
--- a/devtools/build/pack/flutter/analysis_options_user.yaml
+++ b/devtools/build/pack/flutter/analysis_options_user.yaml
@@ -37,6 +37,7 @@
- avoid_empty_else
- avoid_init_to_null
- avoid_return_types_on_setters
+ - avoid_web_libraries_in_flutter
- await_only_futures
- camel_case_types
- cancel_subscriptions
diff --git a/devtools/pubspec.yaml b/devtools/pubspec.yaml
index e95f85b..86ffe63 100644
--- a/devtools/pubspec.yaml
+++ b/devtools/pubspec.yaml
@@ -9,7 +9,7 @@
# package remaining purely as a container for the compiled copy of the devtools
# app. That ensures that version constraints for the devtools_app do not impact
# this package.
-version: 0.1.10
+version: 0.1.11
author: Dart Team <misc@dartlang.org>
homepage: https://github.com/flutter/devtools
diff --git a/meta/BUILD.gn b/meta/BUILD.gn
index e28dc1a..46e112a 100644
--- a/meta/BUILD.gn
+++ b/meta/BUILD.gn
@@ -1,4 +1,4 @@
-# This file is generated by importer.py for meta-1.1.7
+# This file is generated by importer.py for meta-1.1.8
import("//build/dart/dart_library.gni")
diff --git a/meta/CHANGELOG.md b/meta/CHANGELOG.md
index 284d9ba..b5b8c99 100644
--- a/meta/CHANGELOG.md
+++ b/meta/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.1.8
+
+* Introduce `@nonVirtual` to annotate instance members that should not be
+ overridden in subclasses or when mixed in.
+
## 1.1.7
* Introduce `@sealed` to declare that a class or mixin is not allowed as a
diff --git a/meta/lib/meta.dart b/meta/lib/meta.dart
index c6996cc..7b2cd07 100644
--- a/meta/lib/meta.dart
+++ b/meta/lib/meta.dart
@@ -11,11 +11,11 @@
/// of a function that's been marked `@deprecated`, or it might display the
/// function's name differently.
///
-/// For information on installing and importing this library, see the
-/// [meta package on pub.dartlang.org] (http://pub.dartlang.org/packages/meta).
-/// For examples of using annotations, see
-/// [Metadata](https://www.dartlang.org/docs/dart-up-and-running/ch02.html#metadata)
-/// in the language tour.
+/// For information on installing and importing this library, see the [meta
+/// package on pub.dev](https://pub.dev/packages/meta). For examples of using
+/// annotations, see
+/// [Metadata](https://dart.dev/guides/language/language-tour#metadata) in the
+/// language tour.
library meta;
/// Used to annotate a function `f`. Indicates that `f` always throws an
@@ -89,8 +89,8 @@
/// Tools, such as the analyzer, can provide feedback if
///
/// * the annotation is associated with anything other than a method, or
-/// * the annotation is associated with a method that has this annotation that
-/// can return anything other than a newly allocated object or `null`.
+/// * a method that has this annotation can return anything other than a newly
+/// allocated object or `null`.
const _Factory factory = const _Factory();
/// Used to annotate a class `C`. Indicates that `C` and all subtypes of `C`
@@ -149,10 +149,25 @@
/// without invoking the overridden method.
const _MustCallSuper mustCallSuper = const _MustCallSuper();
-/// Used to annotate a class declaration `C`. Indicates that any type arguments
-/// declared on `C` are to be treated as optional. Tools such as the analyzer
-/// and linter can use this information to suppress warnings that would
-/// otherwise require type arguments to be provided for instances of `C`.
+/// Used to annotate an instance member (method, getter, setter, operator, or
+/// field) `m` in a class `C` or mixin `M`. Indicates that `m` should not be
+/// overridden in any classes that extend or mixin `C` or `M`.
+///
+/// Tools, such as the analyzer, can provide feedback if
+///
+/// * the annotation is associated with anything other than an instance member,
+/// * the annotation is associated with an abstract member (because subclasses
+/// are required to override the member),
+/// * the annotation is associated with an extension method,
+/// * the annotation is associated with a member `m` in class `C`, and there is
+/// a class `D` or mixin `M`, that extends or mixes in `C`, that declares an
+/// overriding member `m`.
+const _NonVirtual nonVirtual = const _NonVirtual();
+
+/// Used to annotate a class, mixin, or extension declaration `C`. Indicates
+/// that any type arguments declared on `C` are to be treated as optional.
+/// Tools such as the analyzer and linter can use this information to suppress
+/// warnings that would otherwise require type arguments on `C` to be provided.
const _OptionalTypeArgs optionalTypeArgs = const _OptionalTypeArgs();
/// Used to annotate an instance member (method, getter, setter, operator, or
@@ -168,9 +183,10 @@
/// * the annotation is associated with anything other than an instance member,
/// or
/// * an invocation of a member that has this annotation is used outside of an
-/// instance member defined on a class that extends or mixes in the class in
-/// which the protected member is defined, or that uses a receiver other than
-/// `this`.
+/// instance member defined on a class that extends or mixes in (or a mixin
+/// constrained to) the class in which the protected member is defined.
+/// * an invocation of a member that has this annotation is used within an
+/// instance method, but the receiver is something other than `this`.
const _Protected protected = const _Protected();
/// Used to annotate a named parameter `p` in a method or function `f`.
@@ -216,7 +232,7 @@
/// Tools, such as the analyzer, can provide feedback if
///
/// * the annotation is associated with a declaration other than a public
-/// instance member in a class, or
+/// instance member in a class or mixin, or
/// * the member is referenced outside of the defining library.
const _VisibleForOverriding visibleForOverriding =
const _VisibleForOverriding();
@@ -227,7 +243,8 @@
/// Tools, such as the analyzer, can provide feedback if
///
/// * the annotation is associated with a declaration not in the `lib` folder
-/// of a package, or
+/// of a package, or a private declaration, or a declaration in an unnamed
+/// static extension, or
/// * the declaration is referenced outside of its the defining library or a
/// library which is in the `test` folder of the defining package.
const _VisibleForTesting visibleForTesting = const _VisibleForTesting();
@@ -240,7 +257,7 @@
final String reason;
/// Initialize a newly created instance to have the given [reason].
- const Immutable([this.reason]);
+ const Immutable([this.reason = '']);
}
/// Used to annotate a named parameter `p` in a method or function `f`.
@@ -259,7 +276,7 @@
final String reason;
/// Initialize a newly created instance to have the given [reason].
- const Required([this.reason]);
+ const Required([this.reason = '']);
}
class _AlwaysThrows {
@@ -294,6 +311,10 @@
const _MustCallSuper();
}
+class _NonVirtual {
+ const _NonVirtual();
+}
+
class _OptionalTypeArgs {
const _OptionalTypeArgs();
}
diff --git a/meta/pubspec.yaml b/meta/pubspec.yaml
index 0d1b4f8..3e5ecaf 100644
--- a/meta/pubspec.yaml
+++ b/meta/pubspec.yaml
@@ -1,5 +1,5 @@
name: meta
-version: 1.1.7
+version: 1.1.8
author: Dart Team <misc@dartlang.org>
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/meta
description: >
diff --git a/protobuf/BUILD.gn b/protobuf/BUILD.gn
index 72d09fb..d8e8145 100644
--- a/protobuf/BUILD.gn
+++ b/protobuf/BUILD.gn
@@ -1,4 +1,4 @@
-# This file is generated by importer.py for protobuf-1.0.0
+# This file is generated by importer.py for protobuf-1.0.1
import("//build/dart/dart_library.gni")
diff --git a/protobuf/CHANGELOG.md b/protobuf/CHANGELOG.md
index fa3c989..f1cd835 100644
--- a/protobuf/CHANGELOG.md
+++ b/protobuf/CHANGELOG.md
@@ -1,8 +1,16 @@
+## 1.0.1
+
+* Fix issue with `ExtensionRegistry.reparseMessage` not handling map fields with
+ scalar value types correctly.
+* Fix issue with the non-json name of a field (`protoName`) not being set correctly.
+* Fix: Allow decoding tagnumbers of unknown fields of up to 29 bits.
+
## 1.0.0
* Graduate package to 1.0. No functional changes.
## 0.14.4
+
* Add `permissiveEnums` option to `mergeFromProto3Json`.
It will do a case-insensitive matching of enum values ignoring `-` and `_`.
* Add support for 'ensureX' methods generated by `protoc_plugin` 19.0.0.
diff --git a/protobuf/lib/src/protobuf/builder_info.dart b/protobuf/lib/src/protobuf/builder_info.dart
index 86e6b82..a492f96 100644
--- a/protobuf/lib/src/protobuf/builder_info.dart
+++ b/protobuf/lib/src/protobuf/builder_info.dart
@@ -102,34 +102,40 @@
List<ProtobufEnum> enumValues,
String protoName}) {
add<T>(tagNumber, name, fieldType, defaultOrMaker, subBuilder, valueOf,
- enumValues);
+ enumValues,
+ protoName: protoName);
}
/// Adds PbFieldType.OS String with no default value to reduce generated
/// code size.
void aOS(int tagNumber, String name, {String protoName}) {
- add<String>(tagNumber, name, PbFieldType.OS, null, null, null, null);
+ add<String>(tagNumber, name, PbFieldType.OS, null, null, null, null,
+ protoName: protoName);
}
/// Adds PbFieldType.PS String with no default value.
void pPS(int tagNumber, String name, {String protoName}) {
addRepeated<String>(tagNumber, name, PbFieldType.PS,
- getCheckFunction(PbFieldType.PS), null, null, null);
+ getCheckFunction(PbFieldType.PS), null, null, null,
+ protoName: protoName);
}
/// Adds PbFieldType.QS String with no default value.
void aQS(int tagNumber, String name, {String protoName}) {
- add<String>(tagNumber, name, PbFieldType.QS, null, null, null, null);
+ add<String>(tagNumber, name, PbFieldType.QS, null, null, null, null,
+ protoName: protoName);
}
/// Adds Int64 field with Int64.ZERO default.
void aInt64(int tagNumber, String name, {String protoName}) {
- add<Int64>(tagNumber, name, PbFieldType.O6, Int64.ZERO, null, null, null);
+ add<Int64>(tagNumber, name, PbFieldType.O6, Int64.ZERO, null, null, null,
+ protoName: protoName);
}
/// Adds a boolean with no default value.
void aOB(int tagNumber, String name, {String protoName}) {
- add<bool>(tagNumber, name, PbFieldType.OB, null, null, null, null);
+ add<bool>(tagNumber, name, PbFieldType.OB, null, null, null, null,
+ protoName: protoName);
}
// Enum.
@@ -139,14 +145,16 @@
List<ProtobufEnum> enumValues,
String protoName}) {
add<T>(
- tagNumber, name, fieldType, defaultOrMaker, null, valueOf, enumValues);
+ tagNumber, name, fieldType, defaultOrMaker, null, valueOf, enumValues,
+ protoName: protoName);
}
// Repeated, not a message, group, or enum.
void p<T>(int tagNumber, String name, int fieldType, {String protoName}) {
assert(!_isGroupOrMessage(fieldType) && !_isEnum(fieldType));
addRepeated<T>(tagNumber, name, fieldType, getCheckFunction(fieldType),
- null, null, null);
+ null, null, null,
+ protoName: protoName);
}
// Repeated message, group, or enum.
@@ -157,7 +165,8 @@
String protoName}) {
assert(_isGroupOrMessage(fieldType) || _isEnum(fieldType));
addRepeated<T>(tagNumber, name, fieldType, _checkNotNull, subBuilder,
- valueOf, enumValues);
+ valueOf, enumValues,
+ protoName: protoName);
}
void aOM<T extends GeneratedMessage>(int tagNumber, String name,
@@ -169,7 +178,8 @@
GeneratedMessage._defaultMakerFor<T>(subBuilder),
subBuilder,
null,
- null);
+ null,
+ protoName: protoName);
}
void aQM<T extends GeneratedMessage>(int tagNumber, String name,
@@ -181,7 +191,8 @@
GeneratedMessage._defaultMakerFor<T>(subBuilder),
subBuilder,
null,
- null);
+ null,
+ protoName: protoName);
}
// oneof declarations.
diff --git a/protobuf/lib/src/protobuf/extension_registry.dart b/protobuf/lib/src/protobuf/extension_registry.dart
index b4bbab4..fd04cda 100644
--- a/protobuf/lib/src/protobuf/extension_registry.dart
+++ b/protobuf/lib/src/protobuf/extension_registry.dart
@@ -146,10 +146,10 @@
}
}
}
- } else if (field.isMapField) {
+ } else if (field is MapFieldInfo) {
final messageMap = message._fieldSet._values[field.index];
if (messageMap == null) return;
- if (field.isGroupOrMessage) {
+ if (_isGroupOrMessage(field.valueFieldType)) {
for (var key in messageMap.keys) {
final GeneratedMessage value = messageMap[key];
final GeneratedMessage reparsedValue =
diff --git a/protobuf/lib/src/protobuf/generated_message.dart b/protobuf/lib/src/protobuf/generated_message.dart
index 03ec80c..0944569 100644
--- a/protobuf/lib/src/protobuf/generated_message.dart
+++ b/protobuf/lib/src/protobuf/generated_message.dart
@@ -223,7 +223,6 @@
/// Merges field values from [json], a JSON object using proto3 encoding.
///
/// Well-known types and their special JSON encoding are supported.
- /// Except `FieldMask`.
///
/// If [ignoreUnknownFields] is `false` (the default) an
/// [FormatException] is be thrown if an unknown field name
diff --git a/protobuf/lib/src/protobuf/wire_format.dart b/protobuf/lib/src/protobuf/wire_format.dart
index 5b2659c..3b63eb8 100644
--- a/protobuf/lib/src/protobuf/wire_format.dart
+++ b/protobuf/lib/src/protobuf/wire_format.dart
@@ -14,7 +14,7 @@
const int WIRETYPE_END_GROUP = 4;
const int WIRETYPE_FIXED32 = 5;
-int getTagFieldNumber(int tag) => (tag & 0x7fffffff) >> TAG_TYPE_BITS;
+int getTagFieldNumber(int tag) => tag >> TAG_TYPE_BITS;
int getTagWireType(int tag) => tag & TAG_TYPE_MASK;
diff --git a/protobuf/pubspec.yaml b/protobuf/pubspec.yaml
index c94bcd2..ad484aa 100644
--- a/protobuf/pubspec.yaml
+++ b/protobuf/pubspec.yaml
@@ -1,6 +1,5 @@
name: protobuf
-version: 1.0.0
-author: Dart Team <misc@dartlang.org>
+version: 1.0.1
description: >
Runtime library for protocol buffers support.
Use https://pub.dartlang.org/packages/protoc_plugin to generate dart code for your '.proto' files.
