Merge pull request #1 from open-runtime/aot_monorepo_compat

Merging AOT Monorepo Compat into our Main Branch
2025-01-03 12:13:44 -05:00 · 2025-01-03 12:13:44 -05:00 · 774bf81c73
parent 4a043fa236 00eabed7f6
commit 774bf81c73
19 changed files with 185 additions and 32 deletions
--- a/example/googleapis/googleapis.iml
+++ b/example/googleapis/googleapis.iml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
--- a/example/googleapis/pubspec_overrides.yaml
+++ b/example/googleapis/pubspec_overrides.yaml
@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+  grpc:
+    path: ../..
--- a/example/grpc-web/grpc_web.iml
+++ b/example/grpc-web/grpc_web.iml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
--- a/example/grpc-web/pubspec_overrides.yaml
+++ b/example/grpc-web/pubspec_overrides.yaml
@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+  grpc:
+    path: ../..
--- a/example/helloworld/helloworld.iml
+++ b/example/helloworld/helloworld.iml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
--- a/example/helloworld/pubspec_overrides.yaml
+++ b/example/helloworld/pubspec_overrides.yaml
@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+  grpc:
+    path: ../..
--- a/example/metadata/metadata.iml
+++ b/example/metadata/metadata.iml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
--- a/example/metadata/pubspec_overrides.yaml
+++ b/example/metadata/pubspec_overrides.yaml
@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+  grpc:
+    path: ../..
--- a/example/route_guide/pubspec_overrides.yaml
+++ b/example/route_guide/pubspec_overrides.yaml
@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+  grpc:
+    path: ../..
--- a/example/route_guide/route_guide.iml
+++ b/example/route_guide/route_guide.iml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
--- a/grpc.iml
+++ b/grpc.iml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example" />
+      <excludeFolder url="file://$MODULE_DIR$/interop" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
--- a/interop/interop.iml
+++ b/interop/interop.iml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
--- a/interop/pubspec.yaml
+++ b/interop/pubspec.yaml
@ -3,15 +3,15 @@ description: Dart gRPC interoperability test suite.
 publish_to: none

 environment:
-  sdk: ^3.0.0
+  sdk: '>=3.0.0 <4.0.0'

 dependencies:
-  args: ^2.0.0
-  async: ^2.2.0
-  collection: ^1.14.11
+  args: ^2.5.0
+  async: ^2.11.0
+  collection: ^1.18.0
  grpc:
    path: ../
-  protobuf: ^3.0.0
+  protobuf: ^3.1.0

 dev_dependencies:
-  test: ^1.16.0
+  test: ^1.25.3
--- a/interop/pubspec_overrides.yaml
+++ b/interop/pubspec_overrides.yaml
@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+  grpc:
+    path: ..
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -3,31 +3,30 @@ description: Dart implementation of gRPC, a high performance, open-source univer
 version: 3.2.4

 repository: https://github.com/grpc/grpc-dart
-
 environment:
-  sdk: ^3.0.0
+  sdk: '>=3.3.0 <4.5.0'

 dependencies:
-  archive: ^3.0.0
-  async: ^2.5.0
-  crypto: ^3.0.0
-  fixnum: ^1.0.0
-  googleapis_auth: ^1.1.0
-  meta: ^1.3.0
+  archive: ^3.4.10
+  async: ^2.11.0
+  crypto: ^3.0.3
+  fixnum: ^1.1.0
+  googleapis_auth: ^1.6.0
+  meta: ">=1.11.0 <2.0.0"
  http: '>=0.13.0 <2.0.0'
-  http2: ^2.2.0
+  http2: ^2.3.0
  protobuf: '>=2.0.0 <4.0.0'
  clock: ^1.1.1

 dev_dependencies:
-  build_runner: ^2.0.0
-  build_test: ^2.0.0
+  build_runner: ^2.4.9
+  build_test: ^2.2.2
  lints: ">=2.0.0 <4.0.0"
-  mockito: ^5.0.0
-  path: ^1.8.0
-  test: ^1.16.0
-  stream_channel: ^2.1.0
-  stream_transform: ^2.0.0
+  mockito: ^5.4.4
+  path: ^1.9.0
+  test: ^1.25.3
+  stream_channel: ^2.1.2
+  stream_transform: ^2.1.0
  vm_service: ">=11.6.0 <15.0.0"
  fake_async: ^1.3.1

--- a/test/client_tests/client_keepalive_manager_test.mocks.dart
+++ b/test/client_tests/client_keepalive_manager_test.mocks.dart
@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.4 from annotations
 // in grpc/test/client_tests/client_keepalive_manager_test.dart.
 // Do not manually edit this file.

-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'package:mockito/mockito.dart' as _i1;

@ -13,6 +11,8 @@ import 'client_keepalive_manager_test.dart' as _i2;
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
@ -32,6 +32,7 @@ class MockPinger extends _i1.Mock implements _i2.Pinger {
        ),
        returnValueForMissingStub: null,
      );
+
  @override
  void onPingTimeout() => super.noSuchMethod(
        Invocation.method(
--- a/test/connection_server_test.dart
+++ b/test/connection_server_test.dart
@ -289,7 +289,7 @@ void main() {
      }

      GrpcError? interceptor(call, method) {
-        if (method.name == 'Unary') {
+        if (method.identifier == 'Unary') {
          return null;
        }
        return GrpcError.unauthenticated('Request is unauthenticated');
@ -311,7 +311,7 @@ void main() {

    group('returns error if interceptor blocks request', () {
      GrpcError? interceptor(call, method) {
-        if (method.name == 'Unary') {
+        if (method.identifier == 'Unary') {
          return GrpcError.unauthenticated('Request is unauthenticated');
        }
        return null;
--- a/test/server_test.dart
+++ b/test/server_test.dart
@ -303,7 +303,7 @@ void main() {
      }

      GrpcError? interceptor(call, method) {
-        if (method.name == 'Unary') {
+        if (method.identifier == 'Unary') {
          return null;
        }
        return GrpcError.unauthenticated('Request is unauthenticated');
@ -325,7 +325,7 @@ void main() {

    group('returns error if interceptor blocks request', () {
      GrpcError? interceptor(call, method) {
-        if (method.name == 'Unary') {
+        if (method.identifier == 'Unary') {
          return GrpcError.unauthenticated('Request is unauthenticated');
        }
        return null;
--- a/test/src/client_utils.mocks.dart
+++ b/test/src/client_utils.mocks.dart
@ -1,9 +1,7 @@
-// Mocks generated by Mockito 5.4.1 from annotations
+// Mocks generated by Mockito 5.4.4 from annotations
 // in grpc/test/src/client_utils.dart.
 // Do not manually edit this file.

-// @dart=2.19
-
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;

@ -15,6 +13,8 @@ import 'package:mockito/mockito.dart' as _i1;
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
@ -57,6 +57,7 @@ class MockClientTransportConnection extends _i1.Mock
        Invocation.getter(#isOpen),
        returnValue: false,
      ) as bool);
+
  @override
  set onActiveStateChanged(_i2.ActiveStateHandler? callback) =>
      super.noSuchMethod(
@ -66,21 +67,25 @@ class MockClientTransportConnection extends _i1.Mock
        ),
        returnValueForMissingStub: null,
      );
+
  @override
  _i3.Future<void> get onInitialPeerSettingsReceived => (super.noSuchMethod(
        Invocation.getter(#onInitialPeerSettingsReceived),
        returnValue: _i3.Future<void>.value(),
      ) as _i3.Future<void>);
+
  @override
  _i3.Stream<int> get onPingReceived => (super.noSuchMethod(
        Invocation.getter(#onPingReceived),
        returnValue: _i3.Stream<int>.empty(),
      ) as _i3.Stream<int>);
+
  @override
  _i3.Stream<void> get onFrameReceived => (super.noSuchMethod(
        Invocation.getter(#onFrameReceived),
        returnValue: _i3.Stream<void>.empty(),
      ) as _i3.Stream<void>);
+
  @override
  _i2.ClientTransportStream makeRequest(
    List<_i4.Header>? headers, {
@ -101,6 +106,7 @@ class MockClientTransportConnection extends _i1.Mock
          ),
        ),
      ) as _i2.ClientTransportStream);
+
  @override
  _i3.Future<dynamic> ping() => (super.noSuchMethod(
        Invocation.method(
@ -109,6 +115,7 @@ class MockClientTransportConnection extends _i1.Mock
        ),
        returnValue: _i3.Future<dynamic>.value(),
      ) as _i3.Future<dynamic>);
+
  @override
  _i3.Future<dynamic> finish() => (super.noSuchMethod(
        Invocation.method(
@ -117,6 +124,7 @@ class MockClientTransportConnection extends _i1.Mock
        ),
        returnValue: _i3.Future<dynamic>.value(),
      ) as _i3.Future<dynamic>);
+
  @override
  _i3.Future<dynamic> terminate([int? errorCode]) => (super.noSuchMethod(
        Invocation.method(
@ -141,16 +149,19 @@ class MockClientTransportStream extends _i1.Mock
        Invocation.getter(#peerPushes),
        returnValue: _i3.Stream<_i2.TransportStreamPush>.empty(),
      ) as _i3.Stream<_i2.TransportStreamPush>);
+
  @override
  int get id => (super.noSuchMethod(
        Invocation.getter(#id),
        returnValue: 0,
      ) as int);
+
  @override
  _i3.Stream<_i2.StreamMessage> get incomingMessages => (super.noSuchMethod(
        Invocation.getter(#incomingMessages),
        returnValue: _i3.Stream<_i2.StreamMessage>.empty(),
      ) as _i3.Stream<_i2.StreamMessage>);
+
  @override
  _i3.StreamSink<_i2.StreamMessage> get outgoingMessages => (super.noSuchMethod(
        Invocation.getter(#outgoingMessages),
@ -159,6 +170,7 @@ class MockClientTransportStream extends _i1.Mock
          Invocation.getter(#outgoingMessages),
        ),
      ) as _i3.StreamSink<_i2.StreamMessage>);
+
  @override
  set onTerminated(void Function(int?)? value) => super.noSuchMethod(
        Invocation.setter(
@ -167,6 +179,7 @@ class MockClientTransportStream extends _i1.Mock
        ),
        returnValueForMissingStub: null,
      );
+
  @override
  void terminate() => super.noSuchMethod(
        Invocation.method(
@ -175,6 +188,7 @@ class MockClientTransportStream extends _i1.Mock
        ),
        returnValueForMissingStub: null,
      );
+
  @override
  void sendHeaders(
    List<_i4.Header>? headers, {
@ -188,6 +202,7 @@ class MockClientTransportStream extends _i1.Mock
        ),
        returnValueForMissingStub: null,
      );
+
  @override
  void sendData(
    List<int>? bytes, {