Update protobuf to 6.0.0 and update protobuf example

example_protobuf/README.md

@@ -1,16 +1 @@
 # example_protobuf
-
-A new Flutter project.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.

example_protobuf/lib/example.dart

@@ -1,8 +1,8 @@
 import 'package:dio/dio.dart';
-import 'package:flutter/foundation.dart';
+import 'package:flutter/foundation.dart' show compute;
 import 'package:retrofit/retrofit.dart';
-import 'package:retrofit_example/proto/params.pbserver.dart';
-import 'package:retrofit_example/proto/result.pbserver.dart';
+import 'package:retrofit_example/proto/params.pb.dart';
+import 'package:retrofit_example/proto/result.pb.dart';
 
 part 'example.g.dart';
 

example_protobuf/lib/proto/params.pb.dart

@@ -1,73 +1,64 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: proto/params.proto
-//
-// @dart = 2.12
+// Generated from proto/params.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class Params extends $pb.GeneratedMessage {
   factory Params({
     $core.String? key,
   }) {
-    final $result = create();
-    if (key != null) {
-      $result.key = key;
-    }
-    return $result;
+    final result = create();
+    if (key != null) result.key = key;
+    return result;
   }
 
-  Params._() : super();
+  Params._();
 
-  factory Params.fromBuffer(
-    $core.List<$core.int> i, [
-    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
-  ]) =>
-      create()..mergeFromBuffer(i, r);
+  factory Params.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
 
-  factory Params.fromJson(
-    $core.String i, [
-    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
-  ]) =>
-      create()..mergeFromJson(i, r);
+  factory Params.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-    _omitMessageNames ? '' : 'Params',
-    package: const $pb.PackageName(
-      _omitMessageNames ? '' : 'examples.enumerations',
-    ),
-    createEmptyInstance: create,
-  )
+      _omitMessageNames ? '' : 'Params',
+      package: const $pb.PackageName(
+          _omitMessageNames ? '' : 'examples.enumerations'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'key')
     ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
-  Params clone() => Params()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Params clone() => deepCopy();
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Params copyWith(void Function(Params) updates) =>
       super.copyWith((message) => updates(message as Params)) as Params;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Params create() => Params._();
 
+  @$core.override
   Params createEmptyInstance() => create();
 
-  static $pb.PbList<Params> createRepeated() => $pb.PbList<Params>();
-
   @$core.pragma('dart2js:noInline')
   static Params getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Params>(create);
@@ -77,17 +68,16 @@ class Params extends $pb.GeneratedMessage {
   $core.String get key => $_getSZ(0);
 
   @$pb.TagNumber(1)
-  set key($core.String v) {
-    $_setString(0, v);
-  }
+  set key($core.String value) => $_setString(0, value);
 
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
 
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 }
 
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames =
+const $core.bool _omitFieldNames =
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
+const $core.bool _omitMessageNames =
     $core.bool.fromEnvironment('protobuf.omit_message_names');

example_protobuf/lib/proto/params.pbenum.dart

@@ -1,10 +1,11 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: proto/params.proto
-//
-// @dart = 2.12
+// Generated from proto/params.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports

example_protobuf/lib/proto/params.pbjson.dart

@@ -1,13 +1,15 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: proto/params.proto
-//
-// @dart = 2.12
+// Generated from proto/params.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

example_protobuf/lib/proto/result.pb.dart

@@ -1,70 +1,62 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: proto/result.proto
-//
-// @dart = 2.12
+// Generated from proto/result.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class Result extends $pb.GeneratedMessage {
   factory Result({
     $core.String? value,
   }) {
-    final $result = create();
-    if (value != null) {
-      $result.value = value;
-    }
-    return $result;
+    final result = create();
+    if (value != null) result.value = value;
+    return result;
   }
 
-  Result._() : super();
+  Result._();
 
-  factory Result.fromBuffer(
-    $core.List<$core.int> i, [
-    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
-  ]) =>
-      create()..mergeFromBuffer(i, r);
+  factory Result.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
 
-  factory Result.fromJson(
-    $core.String i, [
-    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
-  ]) =>
-      create()..mergeFromJson(i, r);
+  factory Result.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-    _omitMessageNames ? '' : 'Result',
-    createEmptyInstance: create,
-  )
+      _omitMessageNames ? '' : 'Result',
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'value')
     ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
-  Result clone() => Result()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Result clone() => deepCopy();
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-      'Will be removed in next major version')
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Result copyWith(void Function(Result) updates) =>
       super.copyWith((message) => updates(message as Result)) as Result;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Result create() => Result._();
 
+  @$core.override
   Result createEmptyInstance() => create();
 
-  static $pb.PbList<Result> createRepeated() => $pb.PbList<Result>();
-
   @$core.pragma('dart2js:noInline')
   static Result getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Result>(create);
@@ -74,17 +66,16 @@ class Result extends $pb.GeneratedMessage {
   $core.String get value => $_getSZ(0);
 
   @$pb.TagNumber(1)
-  set value($core.String v) {
-    $_setString(0, v);
-  }
+  set value($core.String value) => $_setString(0, value);
 
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
 
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames =
+const $core.bool _omitFieldNames =
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
+const $core.bool _omitMessageNames =
     $core.bool.fromEnvironment('protobuf.omit_message_names');

example_protobuf/lib/proto/result.pbenum.dart

@@ -1,10 +1,11 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: proto/result.proto
-//
-// @dart = 2.12
+// Generated from proto/result.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports

example_protobuf/lib/proto/result.pbjson.dart

@@ -1,13 +1,15 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: proto/result.proto
-//
-// @dart = 2.12
+// Generated from proto/result.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

example_protobuf/proto/params.proto

@@ -4,4 +4,4 @@ package examples.enumerations;
 
 message Params {
   string key = 1;
-}
+}