Merge upstream/master into aot_monorepo_compat

- Merged upstream changes including protobuf 5.1.0 upgrade
- Updated pubspec.yaml to use protobuf ^5.1.0 (from ^4.0.0)
- Preserved repository URL (open-runtime fork)
- ServerInterceptor and ServerStreamingInvoker already in upstream, preserved
- Resolved conflicts by taking upstream versions for generated protobuf files
- Updated version to 5.0.0 to match upstream

Author: tsavo-at-pieces

.github/workflows/dart.yml

@@ -15,28 +15,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        sdk: [3.5, dev]
+        sdk: [stable, dev]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: ${{ matrix.sdk }}
       - name: Report version
         run: dart --version
       - name: Install dependencies
         run: dart pub get
       - name: Check formatting (using dev dartfmt release)
-        if: ${{ matrix.sdk == 'dev' }}
+        if: ${{ matrix.sdk == 'stable' }}
         run: dart format --output=none --set-exit-if-changed .
-      - name: Analyze code (introp and examples)
-        run: |
-          for example in interop example/*/; do
-            pushd $example
-            echo [Getting dependencies in $example]
-            dart pub get
-            popd
-          done
-        shell: bash
       - name: Analyze code
         run: dart analyze --fatal-infos .
       - name: Check that grpc-web sample builds with DDC
@@ -59,7 +50,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        sdk: [3.5, dev]
+        sdk: [stable, dev]
         platform: [vm, chrome]
         exclude:
           # We only run Chrome tests on Linux. No need to run them
@@ -70,7 +61,7 @@ jobs:
             platform: chrome
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: ${{ matrix.sdk }}
       - name: Report version

.github/workflows/health.yaml

@@ -1,13 +1,14 @@
 name: Health
+
 on:
   pull_request:
     branches: [ master ]
     types: [opened, synchronize, reopened, labeled, unlabeled]
+
 jobs:
   health:
     uses: dart-lang/ecosystem/.github/workflows/health.yaml@main
     with:
-      checks: "changelog,do-not-submit,breaking,coverage,leaking"
-      ignore_coverage: "example/**,interop/**"
+      checks: "changelog,do-not-submit,breaking,leaking"
     permissions:
       pull-requests: write

.github/workflows/post_summaries.yaml

@@ -1,8 +1,9 @@
 name: Comment on the pull request
 
 on:
-  # Trigger this workflow after the Health workflow completes. This workflow will have permissions to
-  # do things like create comments on the PR, even if the original workflow couldn't.
+  # Trigger this workflow after the given workflows completes.
+  # This workflow will have permissions to do things like create comments on the
+  # PR, even if the original workflow couldn't.
   workflow_run:
     workflows:
       - Health
@@ -14,4 +15,4 @@ jobs:
   upload:
     uses: dart-lang/ecosystem/.github/workflows/post_summaries.yaml@main
     permissions:
-      pull-requests: write
+      pull-requests: write

CHANGELOG.md

@@ -1,13 +1,53 @@
-## 4.0.2-wip
+## 5.0.0
+
+- Upgrading protos with new `googleapis` and `protobuf` versions.
+
+## 4.3.1
+
+- Downgrade `meta` dependency to `1.16.0`
+
+## 4.3.0
+
+- Require `package:protobuf` 5.0.0
+
+## 4.2.0
+
+- Export a protobuf generated symbol (`Any`)
+- Simplify hierarchy of `ResponseFuture` (no longer have a private class in the
+  type hierarchy)
+- Require Dart 3.8.
+- Require package:googleapis_auth
+- Require package:http 1.4.0
+- Require package:lints 6.0.0
+- Require package:protobuf 4.1.0
+- Dart format all files for the new 3.8 formatter.
+
+## 4.1.0
+
+* Add a `serverInterceptors` argument to `ConnectionServer`. These interceptors
+  are acting as middleware, wrapping a `ServiceMethod` invocation.
+* Make sure that `CallOptions.mergeWith` is symmetric: given `WebCallOptions`
+  it should return `WebCallOptions`.
+
+## 4.0.4
+
+* Allow the latest `package:googleapis_auth`.
+
+## 4.0.3
+
+* Widen `package:protobuf` constraint to allow version 4.0.0.
+
+## 4.0.2
 
 * Internal optimization to client code.
 * Small fixes, such as ports in testing and enabling `timeline_test.dart`.
-* When the keep alive manager runs into a timeout, it will finish the transport instead of closing
-  the connection, as defined in the gRPC spec.
+* When the keep alive manager runs into a timeout, it will finish the transport
+  instead of closing the connection, as defined in the gRPC spec.
 * Upgrade to `package:lints` version 5.0.0 and Dart SDK version 3.5.0.
 * Upgrade `example/grpc-web` code.
 * Update xhr transport to migrate off legacy JS/HTML apis.
-* Use `package:web` to get `HttpStatus`
+* Use `package:web` to get `HttpStatus`.
+* Fix `package:web` deprecations.
 
 ## 4.0.1
 

analysis_options.yaml

@@ -20,6 +20,5 @@ linter:
     - prefer_final_locals
     - prefer_relative_imports
     - prefer_single_quotes
-    # Enable once 3.7 is stable.
-    # - strict_top_level_inference
+    - strict_top_level_inference
     - test_types_in_equals

example/googleapis/analysis_options.yaml

@@ -1,5 +1 @@
 include: ../../analysis_options.yaml
-
-linter:
-  rules:
-    directives_ordering: false

example/googleapis/bin/logging.dart

@@ -16,18 +16,19 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:grpc/grpc.dart';
-
 import 'package:googleapis/src/generated/google/api/monitored_resource.pb.dart';
 import 'package:googleapis/src/generated/google/logging/type/log_severity.pb.dart';
 import 'package:googleapis/src/generated/google/logging/v2/log_entry.pb.dart';
 import 'package:googleapis/src/generated/google/logging/v2/logging.pbgrpc.dart';
+import 'package:grpc/grpc.dart';
 
 Future<void> main() async {
   final serviceAccountFile = File('logging-service-account.json');
   if (!serviceAccountFile.existsSync()) {
-    print('File logging-service-account.json not found. Please follow the '
-        'steps in README.md to create it.');
+    print(
+      'File logging-service-account.json not found. Please follow the '
+      'steps in README.md to create it.',
+    );
     exit(-1);
   }
 
@@ -36,18 +37,26 @@ Future<void> main() async {
     'https://www.googleapis.com/auth/logging.write',
   ];
 
-  final authenticator = ServiceAccountAuthenticator(serviceAccountFile.readAsStringSync(), scopes);
+  final authenticator = ServiceAccountAuthenticator(
+    serviceAccountFile.readAsStringSync(),
+    scopes,
+  );
   final projectId = authenticator.projectId;
 
   final channel = ClientChannel('logging.googleapis.com');
-  final logging = LoggingServiceV2Client(channel, options: authenticator.toCallOptions);
+  final logging = LoggingServiceV2Client(
+    channel,
+    options: authenticator.toCallOptions,
+  );
 
   final request = WriteLogEntriesRequest()
-    ..entries.add(LogEntry()
-      ..logName = 'projects/$projectId/logs/example'
-      ..severity = LogSeverity.INFO
-      ..resource = (MonitoredResource()..type = 'global')
-      ..textPayload = 'This is a log entry!');
+    ..entries.add(
+      LogEntry()
+        ..logName = 'projects/$projectId/logs/example'
+        ..severity = LogSeverity.INFO
+        ..resource = (MonitoredResource()..type = 'global')
+        ..textPayload = 'This is a log entry!',
+    );
   await logging.writeLogEntries(request);
 
   await channel.shutdown();

example/googleapis/lib/src/generated/google/api/label.pb.dart

@@ -1,20 +1,23 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/label.proto
-//
-// @dart = 2.12
+// Generated from google/api/label.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
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'label.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'label.pbenum.dart';
 
 /// A description of a label.
@@ -25,94 +28,82 @@ class LabelDescriptor extends $pb.GeneratedMessage {
     $core.String? description,
   }) {
     final result = create();
-    if (key != null) {
-      result.key = key;
-    }
-    if (valueType != null) {
-      result.valueType = valueType;
-    }
-    if (description != null) {
-      result.description = description;
-    }
+    if (key != null) result.key = key;
+    if (valueType != null) result.valueType = valueType;
+    if (description != null) result.description = description;
     return result;
   }
-  LabelDescriptor._() : super();
-  factory LabelDescriptor.fromBuffer($core.List<$core.int> i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromBuffer(i, r);
-  factory LabelDescriptor.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'LabelDescriptor',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'google.api'), createEmptyInstance: create)
+
+  LabelDescriptor._();
+
+  factory LabelDescriptor.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory LabelDescriptor.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'LabelDescriptor',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'google.api'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'key')
-    ..e<LabelDescriptor_ValueType>(2, _omitFieldNames ? '' : 'valueType', $pb.PbFieldType.OE,
-        defaultOrMaker: LabelDescriptor_ValueType.STRING,
-        valueOf: LabelDescriptor_ValueType.valueOf,
+    ..aE<LabelDescriptor_ValueType>(2, _omitFieldNames ? '' : 'valueType',
         enumValues: LabelDescriptor_ValueType.values)
     ..aOS(3, _omitFieldNames ? '' : 'description')
     ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
-      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-      'Will be removed in next major version')
-  LabelDescriptor clone() => LabelDescriptor()..mergeFromMessage(this);
-  @$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.')
+  LabelDescriptor clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   LabelDescriptor copyWith(void Function(LabelDescriptor) updates) =>
-      super.copyWith((message) => updates(message as LabelDescriptor)) as LabelDescriptor;
+      super.copyWith((message) => updates(message as LabelDescriptor))
+          as LabelDescriptor;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static LabelDescriptor create() => LabelDescriptor._();
+  @$core.override
   LabelDescriptor createEmptyInstance() => create();
-  static $pb.PbList<LabelDescriptor> createRepeated() => $pb.PbList<LabelDescriptor>();
   @$core.pragma('dart2js:noInline')
-  static LabelDescriptor getDefault() =>
-      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<LabelDescriptor>(create);
+  static LabelDescriptor getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<LabelDescriptor>(create);
   static LabelDescriptor? _defaultInstance;
 
   /// The label key.
   @$pb.TagNumber(1)
   $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);
 
   /// The type of data that can be assigned to the label.
   @$pb.TagNumber(2)
   LabelDescriptor_ValueType get valueType => $_getN(1);
   @$pb.TagNumber(2)
-  set valueType(LabelDescriptor_ValueType v) {
-    setField(2, v);
-  }
-
+  set valueType(LabelDescriptor_ValueType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasValueType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValueType() => clearField(2);
+  void clearValueType() => $_clearField(2);
 
   /// A human-readable description for the label.
   @$pb.TagNumber(3)
   $core.String get description => $_getSZ(2);
   @$pb.TagNumber(3)
-  set description($core.String v) {
-    $_setString(2, v);
-  }
-
+  set description($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasDescription() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDescription() => clearField(3);
+  void clearDescription() => $_clearField(3);
 }
 
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const $core.bool _omitFieldNames =
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');