Merge protobuf versions 1.0.1 and 1.0.2 into 1.0.1 (#321)
diff --git a/protobuf/CHANGELOG.md b/protobuf/CHANGELOG.md
index 2984139..f1cd835 100644
--- a/protobuf/CHANGELOG.md
+++ b/protobuf/CHANGELOG.md
@@ -1,9 +1,7 @@
-## 1.0.2
-
-* Fix issue with `ExtensionRegistry.reparseMessage` not handling map fields with
-scalar value types correctly.
## 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.
@@ -12,6 +10,7 @@
* 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/pubspec.yaml b/protobuf/pubspec.yaml
index d18f586..0f6616b 100644
--- a/protobuf/pubspec.yaml
+++ b/protobuf/pubspec.yaml
@@ -1,5 +1,5 @@
name: protobuf
-version: 1.0.2
+version: 1.0.1
author: Dart Team <misc@dartlang.org>
description: >
Runtime library for protocol buffers support.
diff --git a/protoc_plugin/pubspec.yaml b/protoc_plugin/pubspec.yaml
index 9fe2a2a..3bdd1cb 100644
--- a/protoc_plugin/pubspec.yaml
+++ b/protoc_plugin/pubspec.yaml
@@ -10,7 +10,7 @@
dependencies:
fixnum: ^0.10.9
path: ^1.0.0
- protobuf: '>=1.0.2 <2.0.0'
+ protobuf: '>=1.0.1 <2.0.0'
dart_style: ^1.0.6
dev_dependencies:
