diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart
index 8547c165..e118c4c1 100644
--- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart
+++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/events/cloud/firestore/v1/data.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -18,6 +18,8 @@ import '../../../../protobuf/struct.pbenum.dart' as $2;
 import '../../../../protobuf/timestamp.pb.dart' as $0;
 import '../../../../type/latlng.pb.dart' as $1;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 /// The data within all Firestore document events.
 class DocumentEventData extends $pb.GeneratedMessage {
   factory DocumentEventData({
@@ -87,13 +89,13 @@ class DocumentEventData extends $pb.GeneratedMessage {
   Document get value => $_getN(0);
   @$pb.TagNumber(1)
   set value(Document v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
   @$pb.TagNumber(1)
   Document ensureValue() => $_ensure(0);
 
@@ -103,13 +105,13 @@ class DocumentEventData extends $pb.GeneratedMessage {
   Document get oldValue => $_getN(1);
   @$pb.TagNumber(2)
   set oldValue(Document v) {
-    setField(2, v);
+    $_setField(2, v);
   }
 
   @$pb.TagNumber(2)
   $core.bool hasOldValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearOldValue() => clearField(2);
+  void clearOldValue() => $_clearField(2);
   @$pb.TagNumber(2)
   Document ensureOldValue() => $_ensure(1);
 
@@ -119,13 +121,13 @@ class DocumentEventData extends $pb.GeneratedMessage {
   DocumentMask get updateMask => $_getN(2);
   @$pb.TagNumber(3)
   set updateMask(DocumentMask v) {
-    setField(3, v);
+    $_setField(3, v);
   }
 
   @$pb.TagNumber(3)
   $core.bool hasUpdateMask() => $_has(2);
   @$pb.TagNumber(3)
-  void clearUpdateMask() => clearField(3);
+  void clearUpdateMask() => $_clearField(3);
   @$pb.TagNumber(3)
   DocumentMask ensureUpdateMask() => $_ensure(2);
 }
@@ -184,14 +186,14 @@ class DocumentMask extends $pb.GeneratedMessage {
   /// See [Document.fields][google.cloud.firestore.v1.events.Document.fields]
   /// for a field path syntax reference.
   @$pb.TagNumber(1)
-  $core.List<$core.String> get fieldPaths => $_getList(0);
+  $pb.PbList<$core.String> get fieldPaths => $_getList(0);
 }
 
 /// A Firestore document.
 class Document extends $pb.GeneratedMessage {
   factory Document({
     $core.String? name,
-    $core.Map<$core.String, Value>? fields,
+    $pb.PbMap<$core.String, Value>? fields,
     $0.Timestamp? createTime,
     $0.Timestamp? updateTime,
   }) {
@@ -270,7 +272,7 @@ class Document extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   ///  The document's fields.
   ///
@@ -297,7 +299,7 @@ class Document extends $pb.GeneratedMessage {
   ///  escaped using a `\`. For example, `` `x&y` `` represents `x&y` and
   ///  `` `bak\`tik` `` represents `` bak`tik ``.
   @$pb.TagNumber(2)
-  $core.Map<$core.String, Value> get fields => $_getMap(1);
+  $pb.PbMap<$core.String, Value> get fields => $_getMap(1);
 
   ///  The time at which the document was created.
   ///
@@ -308,13 +310,13 @@ class Document extends $pb.GeneratedMessage {
   $0.Timestamp get createTime => $_getN(2);
   @$pb.TagNumber(3)
   set createTime($0.Timestamp v) {
-    setField(3, v);
+    $_setField(3, v);
   }
 
   @$pb.TagNumber(3)
   $core.bool hasCreateTime() => $_has(2);
   @$pb.TagNumber(3)
-  void clearCreateTime() => clearField(3);
+  void clearCreateTime() => $_clearField(3);
   @$pb.TagNumber(3)
   $0.Timestamp ensureCreateTime() => $_ensure(2);
 
@@ -327,13 +329,13 @@ class Document extends $pb.GeneratedMessage {
   $0.Timestamp get updateTime => $_getN(3);
   @$pb.TagNumber(4)
   set updateTime($0.Timestamp v) {
-    setField(4, v);
+    $_setField(4, v);
   }
 
   @$pb.TagNumber(4)
   $core.bool hasUpdateTime() => $_has(3);
   @$pb.TagNumber(4)
-  void clearUpdateTime() => clearField(4);
+  void clearUpdateTime() => $_clearField(4);
   @$pb.TagNumber(4)
   $0.Timestamp ensureUpdateTime() => $_ensure(3);
 }
@@ -477,7 +479,7 @@ class Value extends $pb.GeneratedMessage {
   static Value? _defaultInstance;
 
   Value_ValueType whichValueType() => _Value_ValueTypeByTag[$_whichOneof(0)]!;
-  void clearValueType() => clearField($_whichOneof(0));
+  void clearValueType() => $_clearField($_whichOneof(0));
 
   /// A boolean value.
   @$pb.TagNumber(1)
@@ -490,7 +492,7 @@ class Value extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasBooleanValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearBooleanValue() => clearField(1);
+  void clearBooleanValue() => $_clearField(1);
 
   /// An integer value.
   @$pb.TagNumber(2)
@@ -503,7 +505,7 @@ class Value extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasIntegerValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearIntegerValue() => clearField(2);
+  void clearIntegerValue() => $_clearField(2);
 
   /// A double value.
   @$pb.TagNumber(3)
@@ -516,7 +518,7 @@ class Value extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasDoubleValue() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDoubleValue() => clearField(3);
+  void clearDoubleValue() => $_clearField(3);
 
   /// A reference to a document. For example:
   /// `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
@@ -530,20 +532,20 @@ class Value extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasReferenceValue() => $_has(3);
   @$pb.TagNumber(5)
-  void clearReferenceValue() => clearField(5);
+  void clearReferenceValue() => $_clearField(5);
 
   /// A map value.
   @$pb.TagNumber(6)
   MapValue get mapValue => $_getN(4);
   @$pb.TagNumber(6)
   set mapValue(MapValue v) {
-    setField(6, v);
+    $_setField(6, v);
   }
 
   @$pb.TagNumber(6)
   $core.bool hasMapValue() => $_has(4);
   @$pb.TagNumber(6)
-  void clearMapValue() => clearField(6);
+  void clearMapValue() => $_clearField(6);
   @$pb.TagNumber(6)
   MapValue ensureMapValue() => $_ensure(4);
 
@@ -552,13 +554,13 @@ class Value extends $pb.GeneratedMessage {
   $1.LatLng get geoPointValue => $_getN(5);
   @$pb.TagNumber(8)
   set geoPointValue($1.LatLng v) {
-    setField(8, v);
+    $_setField(8, v);
   }
 
   @$pb.TagNumber(8)
   $core.bool hasGeoPointValue() => $_has(5);
   @$pb.TagNumber(8)
-  void clearGeoPointValue() => clearField(8);
+  void clearGeoPointValue() => $_clearField(8);
   @$pb.TagNumber(8)
   $1.LatLng ensureGeoPointValue() => $_ensure(5);
 
@@ -570,13 +572,13 @@ class Value extends $pb.GeneratedMessage {
   ArrayValue get arrayValue => $_getN(6);
   @$pb.TagNumber(9)
   set arrayValue(ArrayValue v) {
-    setField(9, v);
+    $_setField(9, v);
   }
 
   @$pb.TagNumber(9)
   $core.bool hasArrayValue() => $_has(6);
   @$pb.TagNumber(9)
-  void clearArrayValue() => clearField(9);
+  void clearArrayValue() => $_clearField(9);
   @$pb.TagNumber(9)
   ArrayValue ensureArrayValue() => $_ensure(6);
 
@@ -588,13 +590,13 @@ class Value extends $pb.GeneratedMessage {
   $0.Timestamp get timestampValue => $_getN(7);
   @$pb.TagNumber(10)
   set timestampValue($0.Timestamp v) {
-    setField(10, v);
+    $_setField(10, v);
   }
 
   @$pb.TagNumber(10)
   $core.bool hasTimestampValue() => $_has(7);
   @$pb.TagNumber(10)
-  void clearTimestampValue() => clearField(10);
+  void clearTimestampValue() => $_clearField(10);
   @$pb.TagNumber(10)
   $0.Timestamp ensureTimestampValue() => $_ensure(7);
 
@@ -603,13 +605,13 @@ class Value extends $pb.GeneratedMessage {
   $2.NullValue get nullValue => $_getN(8);
   @$pb.TagNumber(11)
   set nullValue($2.NullValue v) {
-    setField(11, v);
+    $_setField(11, v);
   }
 
   @$pb.TagNumber(11)
   $core.bool hasNullValue() => $_has(8);
   @$pb.TagNumber(11)
-  void clearNullValue() => clearField(11);
+  void clearNullValue() => $_clearField(11);
 
   ///  A string value.
   ///
@@ -626,7 +628,7 @@ class Value extends $pb.GeneratedMessage {
   @$pb.TagNumber(17)
   $core.bool hasStringValue() => $_has(9);
   @$pb.TagNumber(17)
-  void clearStringValue() => clearField(17);
+  void clearStringValue() => $_clearField(17);
 
   ///  A bytes value.
   ///
@@ -642,7 +644,7 @@ class Value extends $pb.GeneratedMessage {
   @$pb.TagNumber(18)
   $core.bool hasBytesValue() => $_has(10);
   @$pb.TagNumber(18)
-  void clearBytesValue() => clearField(18);
+  void clearBytesValue() => $_clearField(18);
 }
 
 /// An array value.
@@ -696,13 +698,13 @@ class ArrayValue extends $pb.GeneratedMessage {
 
   /// Values in the array.
   @$pb.TagNumber(1)
-  $core.List<Value> get values => $_getList(0);
+  $pb.PbList<Value> get values => $_getList(0);
 }
 
 /// A map value.
 class MapValue extends $pb.GeneratedMessage {
   factory MapValue({
-    $core.Map<$core.String, Value>? fields,
+    $pb.PbMap<$core.String, Value>? fields,
   }) {
     final $result = create();
     if (fields != null) {
@@ -760,7 +762,7 @@ class MapValue extends $pb.GeneratedMessage {
   ///  in certain documented contexts. The map keys, represented as UTF-8, must
   ///  not exceed 1,500 bytes and cannot be empty.
   @$pb.TagNumber(1)
-  $core.Map<$core.String, Value> get fields => $_getMap(0);
+  $pb.PbMap<$core.String, Value> get fields => $_getMap(0);
 }
 
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart
index 9a3f9f14..e5c86a5c 100644
--- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart
+++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/events/cloud/firestore/v1/data.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart
index 6c6b7a9f..54ad5bb5 100644
--- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart
+++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/events/cloud/firestore/v1/data.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart
index 632e8dd3..4df2368b 100644
--- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart
+++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/events/cloud/firestore/v1/data.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart
index 348495b4..380693e1 100644
--- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart
+++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/events/cloud/firestore/v1/events.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'data.pb.dart' as $3;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 /// The CloudEvent raised when a Firestore document is created.
 class DocumentCreatedEvent extends $pb.GeneratedMessage {
   factory DocumentCreatedEvent({
@@ -72,13 +74,13 @@ class DocumentCreatedEvent extends $pb.GeneratedMessage {
   $3.DocumentEventData get data => $_getN(0);
   @$pb.TagNumber(1)
   set data($3.DocumentEventData v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasData() => $_has(0);
   @$pb.TagNumber(1)
-  void clearData() => clearField(1);
+  void clearData() => $_clearField(1);
   @$pb.TagNumber(1)
   $3.DocumentEventData ensureData() => $_ensure(0);
 }
@@ -140,13 +142,13 @@ class DocumentUpdatedEvent extends $pb.GeneratedMessage {
   $3.DocumentEventData get data => $_getN(0);
   @$pb.TagNumber(1)
   set data($3.DocumentEventData v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasData() => $_has(0);
   @$pb.TagNumber(1)
-  void clearData() => clearField(1);
+  void clearData() => $_clearField(1);
   @$pb.TagNumber(1)
   $3.DocumentEventData ensureData() => $_ensure(0);
 }
@@ -208,13 +210,13 @@ class DocumentDeletedEvent extends $pb.GeneratedMessage {
   $3.DocumentEventData get data => $_getN(0);
   @$pb.TagNumber(1)
   set data($3.DocumentEventData v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasData() => $_has(0);
   @$pb.TagNumber(1)
-  void clearData() => clearField(1);
+  void clearData() => $_clearField(1);
   @$pb.TagNumber(1)
   $3.DocumentEventData ensureData() => $_ensure(0);
 }
@@ -277,13 +279,13 @@ class DocumentWrittenEvent extends $pb.GeneratedMessage {
   $3.DocumentEventData get data => $_getN(0);
   @$pb.TagNumber(1)
   set data($3.DocumentEventData v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasData() => $_has(0);
   @$pb.TagNumber(1)
-  void clearData() => clearField(1);
+  void clearData() => $_clearField(1);
   @$pb.TagNumber(1)
   $3.DocumentEventData ensureData() => $_ensure(0);
 }
@@ -350,13 +352,13 @@ class DocumentCreatedEventWithAuthContext extends $pb.GeneratedMessage {
   $3.DocumentEventData get data => $_getN(0);
   @$pb.TagNumber(1)
   set data($3.DocumentEventData v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasData() => $_has(0);
   @$pb.TagNumber(1)
-  void clearData() => clearField(1);
+  void clearData() => $_clearField(1);
   @$pb.TagNumber(1)
   $3.DocumentEventData ensureData() => $_ensure(0);
 }
@@ -423,13 +425,13 @@ class DocumentUpdatedEventWithAuthContext extends $pb.GeneratedMessage {
   $3.DocumentEventData get data => $_getN(0);
   @$pb.TagNumber(1)
   set data($3.DocumentEventData v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasData() => $_has(0);
   @$pb.TagNumber(1)
-  void clearData() => clearField(1);
+  void clearData() => $_clearField(1);
   @$pb.TagNumber(1)
   $3.DocumentEventData ensureData() => $_ensure(0);
 }
@@ -496,13 +498,13 @@ class DocumentDeletedEventWithAuthContext extends $pb.GeneratedMessage {
   $3.DocumentEventData get data => $_getN(0);
   @$pb.TagNumber(1)
   set data($3.DocumentEventData v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasData() => $_has(0);
   @$pb.TagNumber(1)
-  void clearData() => clearField(1);
+  void clearData() => $_clearField(1);
   @$pb.TagNumber(1)
   $3.DocumentEventData ensureData() => $_ensure(0);
 }
@@ -570,13 +572,13 @@ class DocumentWrittenEventWithAuthContext extends $pb.GeneratedMessage {
   $3.DocumentEventData get data => $_getN(0);
   @$pb.TagNumber(1)
   set data($3.DocumentEventData v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasData() => $_has(0);
   @$pb.TagNumber(1)
-  void clearData() => clearField(1);
+  void clearData() => $_clearField(1);
   @$pb.TagNumber(1)
   $3.DocumentEventData ensureData() => $_ensure(0);
 }
diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart
index 3d31dddb..d88a2509 100644
--- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart
+++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/events/cloud/firestore/v1/events.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart
index d1084680..1aabdbe1 100644
--- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart
+++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/events/cloud/firestore/v1/events.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart
index cc2e10bd..4e57fc75 100644
--- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart
+++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/events/cloud/firestore/v1/events.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart
index 42d55e42..5e71df26 100644
--- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart
+++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,6 +16,8 @@ import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
 
 import 'struct.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'struct.pbenum.dart';
 
 ///  `Struct` represents a structured data value, consisting of fields
@@ -28,7 +30,7 @@ export 'struct.pbenum.dart';
 ///  The JSON representation for `Struct` is JSON object.
 class Struct extends $pb.GeneratedMessage with $mixin.StructMixin {
   factory Struct({
-    $core.Map<$core.String, Value>? fields,
+    $pb.PbMap<$core.String, Value>? fields,
   }) {
     final $result = create();
     if (fields != null) {
@@ -83,7 +85,7 @@ class Struct extends $pb.GeneratedMessage with $mixin.StructMixin {
 
   /// Unordered map of dynamically typed values.
   @$pb.TagNumber(1)
-  $core.Map<$core.String, Value> get fields => $_getMap(0);
+  $pb.PbMap<$core.String, Value> get fields => $_getMap(0);
 }
 
 enum Value_Kind {
@@ -193,20 +195,20 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   static Value? _defaultInstance;
 
   Value_Kind whichKind() => _Value_KindByTag[$_whichOneof(0)]!;
-  void clearKind() => clearField($_whichOneof(0));
+  void clearKind() => $_clearField($_whichOneof(0));
 
   /// Represents a null value.
   @$pb.TagNumber(1)
   NullValue get nullValue => $_getN(0);
   @$pb.TagNumber(1)
   set nullValue(NullValue v) {
-    setField(1, v);
+    $_setField(1, v);
   }
 
   @$pb.TagNumber(1)
   $core.bool hasNullValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearNullValue() => clearField(1);
+  void clearNullValue() => $_clearField(1);
 
   /// Represents a double value.
   @$pb.TagNumber(2)
@@ -219,7 +221,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   @$pb.TagNumber(2)
   $core.bool hasNumberValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNumberValue() => clearField(2);
+  void clearNumberValue() => $_clearField(2);
 
   /// Represents a string value.
   @$pb.TagNumber(3)
@@ -232,7 +234,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   @$pb.TagNumber(3)
   $core.bool hasStringValue() => $_has(2);
   @$pb.TagNumber(3)
-  void clearStringValue() => clearField(3);
+  void clearStringValue() => $_clearField(3);
 
   /// Represents a boolean value.
   @$pb.TagNumber(4)
@@ -245,20 +247,20 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   @$pb.TagNumber(4)
   $core.bool hasBoolValue() => $_has(3);
   @$pb.TagNumber(4)
-  void clearBoolValue() => clearField(4);
+  void clearBoolValue() => $_clearField(4);
 
   /// Represents a structured value.
   @$pb.TagNumber(5)
   Struct get structValue => $_getN(4);
   @$pb.TagNumber(5)
   set structValue(Struct v) {
-    setField(5, v);
+    $_setField(5, v);
   }
 
   @$pb.TagNumber(5)
   $core.bool hasStructValue() => $_has(4);
   @$pb.TagNumber(5)
-  void clearStructValue() => clearField(5);
+  void clearStructValue() => $_clearField(5);
   @$pb.TagNumber(5)
   Struct ensureStructValue() => $_ensure(4);
 
@@ -267,13 +269,13 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   ListValue get listValue => $_getN(5);
   @$pb.TagNumber(6)
   set listValue(ListValue v) {
-    setField(6, v);
+    $_setField(6, v);
   }
 
   @$pb.TagNumber(6)
   $core.bool hasListValue() => $_has(5);
   @$pb.TagNumber(6)
-  void clearListValue() => clearField(6);
+  void clearListValue() => $_clearField(6);
   @$pb.TagNumber(6)
   ListValue ensureListValue() => $_ensure(5);
 }
@@ -333,7 +335,7 @@ class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin {
 
   /// Repeated field of dynamically typed values.
   @$pb.TagNumber(1)
-  $core.List<Value> get values => $_getList(0);
+  $pb.PbList<Value> get values => $_getList(0);
 }
 
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart
index 7f9bf0cb..78528b71 100644
--- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart
+++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -18,6 +18,7 @@ import 'package:protobuf/protobuf.dart' as $pb;
 ///
 ///  The JSON representation for `NullValue` is JSON `null`.
 class NullValue extends $pb.ProtobufEnum {
+  /// Null value.
   static const NullValue NULL_VALUE =
       NullValue._(0, _omitEnumNames ? '' : 'NULL_VALUE');
 
@@ -29,7 +30,7 @@ class NullValue extends $pb.ProtobufEnum {
       $pb.ProtobufEnum.initByValue(values);
   static NullValue? valueOf($core.int value) => _byValue[value];
 
-  const NullValue._($core.int v, $core.String n) : super(v, n);
+  const NullValue._(super.v, super.n);
 }
 
 const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart
index c0693f57..36967b55 100644
--- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart
+++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart
index 3044bbcd..61cf5414 100644
--- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart
+++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart
index 48e11b93..4d8b6cba 100644
--- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart
+++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/timestamp.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  A Timestamp represents a point in time independent of any time zone or local
 ///  calendar, encoded as a count of seconds and fractions of seconds at
 ///  nanosecond resolution. The count is relative to an epoch at UTC midnight on
@@ -171,7 +173,7 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
   @$pb.TagNumber(1)
   $core.bool hasSeconds() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSeconds() => clearField(1);
+  void clearSeconds() => $_clearField(1);
 
   /// Non-negative fractions of a second at nanosecond resolution. Negative
   /// second values with fractions must still have non-negative nanos values
@@ -187,7 +189,7 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
   @$pb.TagNumber(2)
   $core.bool hasNanos() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNanos() => clearField(2);
+  void clearNanos() => $_clearField(2);
 
   /// Creates a new instance from [dateTime].
   ///
diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart
index a194b805..1eaa8d17 100644
--- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart
+++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/timestamp.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart
index 39ab20fa..2fc1450f 100644
--- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart
+++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/timestamp.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart
index 113d2b12..8f1e5c65 100644
--- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart
+++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/timestamp.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart
index 392a4fa5..98ce86a8 100644
--- a/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart
+++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/type/latlng.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 /// An object that represents a latitude/longitude pair. This is expressed as a
 /// pair of doubles to represent degrees latitude and degrees longitude. Unless
 /// specified otherwise, this must conform to the
@@ -80,7 +82,7 @@ class LatLng extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasLatitude() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLatitude() => clearField(1);
+  void clearLatitude() => $_clearField(1);
 
   /// The longitude in degrees. It must be in the range [-180.0, +180.0].
   @$pb.TagNumber(2)
@@ -93,7 +95,7 @@ class LatLng extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLongitude() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLongitude() => clearField(2);
+  void clearLongitude() => $_clearField(2);
 }
 
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart
index 76cae745..ad4672e4 100644
--- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart
+++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/type/latlng.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart
index 45d99883..4775a013 100644
--- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart
+++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/type/latlng.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart
index 80232746..30a596f5 100644
--- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart
+++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/type/latlng.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names
diff --git a/examples/protobuf_firestore/pubspec.yaml b/examples/protobuf_firestore/pubspec.yaml
index 891ea987..a19ab3fc 100644
--- a/examples/protobuf_firestore/pubspec.yaml
+++ b/examples/protobuf_firestore/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dependencies:
   functions_framework: ^0.4.3
-  protobuf: ^3.0.0
+  protobuf: ^4.0.0
   shelf: ^1.4.0
 
 dev_dependencies:
diff --git a/google_cloud/pubspec.yaml b/google_cloud/pubspec.yaml
index 1f0f9a21..5849f69a 100644
--- a/google_cloud/pubspec.yaml
+++ b/google_cloud/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
 
 dev_dependencies:
   dart_flutter_team_lints: ^3.0.0
-  googleapis: ^13.0.0
-  googleapis_auth: ^1.4.1
+  googleapis: ^14.0.0
+  googleapis_auth: ^2.0.0
   test: ^1.22.0
   test_process: ^2.0.3