update deps; simplify analysis options

.github/workflows/dart.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        sdk: [3.5, dev]
+        sdk: [stable, dev]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
@@ -27,7 +27,7 @@ jobs:
       - 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: |
@@ -60,7 +60,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

CHANGELOG.md

@@ -1,6 +1,16 @@
+## 4.1.1-wip
+
+- Require Dart 3.8.
+- Dart format all files for the new 3.8 formatter.
+- Require package:googleapis_auth
+- Require package:http 1.4.0
+- Require package:lints 6.0.0
+- Require package:protobuf 4.1.0
+
 ## 4.1.0
-* Add a `serverInterceptors` argument to `ConnectionServer`. These interceptors are acting
-  as middleware, wrapping a `ServiceMethod` invocation.
+
+* 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`.
 
@@ -16,8 +26,8 @@
 
 * 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.

analysis_options.yaml

@@ -17,6 +17,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);
   }
 
@@ -37,19 +38,25 @@ Future<void> main() async {
   ];
 
   final authenticator = ServiceAccountAuthenticator(
-      serviceAccountFile.readAsStringSync(), scopes);
+    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/pubspec.yaml

@@ -3,15 +3,15 @@ description: Dart gRPC client sample for Google APIs
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ^3.8.0
 
 dependencies:
-  async: ^2.2.0
-  fixnum:
+  async: ^2.13.0
+  fixnum: ^1.1.1
   grpc:
     path: ../../
-  protobuf: ">=3.0.0 <5.0.0"
+  protobuf: ^4.1.0
 
 dev_dependencies:
-  lints: ^2.0.0
-  test: ^1.6.4
+  lints: ^6.0.0
+  test: ^1.26.2

example/grpc-web/analysis_options.yaml

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

example/grpc-web/lib/app.dart

@@ -39,11 +39,17 @@ class EchoApp {
       ..message = message
       ..messageCount = count
       ..messageInterval = 500;
-    _service.serverStreamingEcho(request).listen((response) {
-      _addRightMessage(response.message);
-    }, onError: (error) {
-      _addRightMessage(error.toString());
-    }, onDone: () => print('Closed connection to server.'));
+    _service
+        .serverStreamingEcho(request)
+        .listen(
+          (response) {
+            _addRightMessage(response.message);
+          },
+          onError: (error) {
+            _addRightMessage(error.toString());
+          },
+          onDone: () => print('Closed connection to server.'),
+        );
   }
 
   void _addLeftMessage(String message) {
@@ -55,13 +61,20 @@ class EchoApp {
   }
 
   void _addMessage(String message, String cssClass) {
-    document.querySelector('#first')!.after(HTMLDivElement()
-      ..classList.add('row')
-      ..append(HTMLHeadingElement.h2()
-        ..append(HTMLSpanElement()
-          ..classList.add('label')
-          ..classList.addAll(cssClass)
-          ..textContent = message)));
+    document
+        .querySelector('#first')!
+        .after(
+          HTMLDivElement()
+            ..classList.add('row')
+            ..append(
+              HTMLHeadingElement.h2()..append(
+                HTMLSpanElement()
+                  ..classList.add('label')
+                  ..classList.addAll(cssClass)
+                  ..textContent = message,
+              ),
+            ),
+        );
   }
 }
 

example/grpc-web/pubspec.yaml

@@ -3,15 +3,15 @@ description: Dart gRPC-Web sample client
 publish_to: none
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.8.0
 
 dependencies:
   grpc:
     path: ../../
-  protobuf: ">=3.0.0 <5.0.0"
-  web: ^1.1.0
+  protobuf: ^4.1.0
+  web: ^1.1.1
 
 dev_dependencies:
-  build_runner: ^2.4.13
-  build_web_compilers: ^4.0.11
-  lints: ^5.0.0
+  build_runner: ^2.4.15
+  build_web_compilers: ^4.1.5
+  lints: ^6.0.0

example/helloworld/analysis_options.yaml

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

example/helloworld/bin/client.dart

@@ -23,8 +23,9 @@ Future<void> main(List<String> args) async {
     port: 50051,
     options: ChannelOptions(
       credentials: ChannelCredentials.insecure(),
-      codecRegistry:
-          CodecRegistry(codecs: const [GzipCodec(), IdentityCodec()]),
+      codecRegistry: CodecRegistry(
+        codecs: const [GzipCodec(), IdentityCodec()],
+      ),
     ),
   );
   final stub = GreeterClient(channel);

example/helloworld/bin/unix_client.dart

@@ -20,8 +20,10 @@ import 'package:helloworld/src/generated/helloworld.pbgrpc.dart';
 
 /// Dart implementation of the gRPC helloworld.Greeter client.
 Future<void> main(List<String> args) async {
-  final udsAddress =
-      InternetAddress('localhost', type: InternetAddressType.unix);
+  final udsAddress = InternetAddress(
+    'localhost',
+    type: InternetAddressType.unix,
+  );
   final channel = ClientChannel(
     udsAddress,
     port: 0,

example/helloworld/bin/unix_server.dart

@@ -27,8 +27,10 @@ class GreeterService extends GreeterServiceBase {
 }
 
 Future<void> main(List<String> args) async {
-  final udsAddress =
-      InternetAddress('localhost', type: InternetAddressType.unix);
+  final udsAddress = InternetAddress(
+    'localhost',
+    type: InternetAddressType.unix,
+  );
   final server = Server.create(services: [GreeterService()]);
   await server.serve(address: udsAddress);
   print('Start UNIX Server @localhost...');

example/helloworld/pubspec.yaml

@@ -3,13 +3,13 @@ description: Dart gRPC sample client and server.
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ^3.8.0
 
 dependencies:
-  async: ^2.2.0
+  async: ^2.13.0
   grpc:
     path: ../../
-  protobuf: ">=3.0.0 <5.0.0"
+  protobuf: ^4.1.0
 
 dev_dependencies:
-  lints: ^2.0.0
+  lints: ^6.0.0

example/metadata/analysis_options.yaml

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

example/metadata/lib/src/client.dart

@@ -24,10 +24,11 @@ class Client {
   late MetadataClient stub;
 
   Future<void> main(List<String> args) async {
-    channel = ClientChannel('127.0.0.1',
-        port: 8080,
-        options:
-            const ChannelOptions(credentials: ChannelCredentials.insecure()));
+    channel = ClientChannel(
+      '127.0.0.1',
+      port: 8080,
+      options: const ChannelOptions(credentials: ChannelCredentials.insecure()),
+    );
     stub = MetadataClient(channel);
     // Run all of the demos in order.
     await runEcho();
@@ -44,8 +45,10 @@ class Client {
   /// metadata.
   Future<void> runEcho() async {
     final request = Record()..value = 'Kaj';
-    final call =
-        stub.echo(request, options: CallOptions(metadata: {'peer': 'Verner'}));
+    final call = stub.echo(
+      request,
+      options: CallOptions(metadata: {'peer': 'Verner'}),
+    );
     call.headers.then((headers) {
       print('Received header metadata: $headers');
     });
@@ -62,11 +65,15 @@ class Client {
   /// well as a per-call metadata. The server will delay the response for the
   /// requested duration, during which the client will cancel the RPC.
   Future<void> runEchoDelayCancel() async {
-    final stubWithCustomOptions = MetadataClient(channel,
-        options: CallOptions(metadata: {'peer': 'Verner'}));
+    final stubWithCustomOptions = MetadataClient(
+      channel,
+      options: CallOptions(metadata: {'peer': 'Verner'}),
+    );
     final request = Record()..value = 'Kaj';
-    final call = stubWithCustomOptions.echo(request,
-        options: CallOptions(metadata: {'delay': '1'}));
+    final call = stubWithCustomOptions.echo(
+      request,
+      options: CallOptions(metadata: {'delay': '1'}),
+    );
     call.headers.then((headers) {
       print('Received header metadata: $headers');
     });
@@ -89,8 +96,9 @@ class Client {
   /// receiving 3 responses.
   Future<void> runAddOneCancel() async {
     final numbers = StreamController<int>();
-    final call =
-        stub.addOne(numbers.stream.map((value) => Number()..value = value));
+    final call = stub.addOne(
+      numbers.stream.map((value) => Number()..value = value),
+    );
     final receivedThree = Completer<bool>();
     final sub = call.listen((number) {
       print('AddOneCancel: Received ${number.value}');
@@ -133,8 +141,10 @@ class Client {
   /// Call an RPC that returns a stream of Fibonacci numbers, and specify an RPC
   /// timeout of 2 seconds.
   Future<void> runFibonacciTimeout() async {
-    final call = stub.fibonacci(Empty(),
-        options: CallOptions(timeout: Duration(seconds: 2)));
+    final call = stub.fibonacci(
+      Empty(),
+      options: CallOptions(timeout: Duration(seconds: 2)),
+    );
     var count = 0;
     try {
       await for (var number in call) {

example/metadata/pubspec.yaml

@@ -3,14 +3,14 @@ description: Dart gRPC sample client and server.
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ^3.8.0
 
 dependencies:
-  async: ^2.2.0
+  async: ^2.13.0
   grpc:
     path: ../../
-  protobuf: ">=3.0.0 <5.0.0"
+  protobuf: ^4.1.0
 
 dev_dependencies:
-  lints: ^2.0.0
-  test: ^1.6.0
+  lints: ^6.0.0
+  test: ^1.26.2