diff --git a/example/googleapis/googleapis.iml b/example/googleapis/googleapis.iml
new file mode 100644
index 00000000..389d07a1
--- /dev/null
+++ b/example/googleapis/googleapis.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/example/googleapis/pubspec_overrides.yaml b/example/googleapis/pubspec_overrides.yaml
new file mode 100644
index 00000000..c6917691
--- /dev/null
+++ b/example/googleapis/pubspec_overrides.yaml
@@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+ grpc:
+ path: ../..
diff --git a/example/grpc-web/grpc_web.iml b/example/grpc-web/grpc_web.iml
new file mode 100644
index 00000000..389d07a1
--- /dev/null
+++ b/example/grpc-web/grpc_web.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/example/grpc-web/pubspec_overrides.yaml b/example/grpc-web/pubspec_overrides.yaml
new file mode 100644
index 00000000..c6917691
--- /dev/null
+++ b/example/grpc-web/pubspec_overrides.yaml
@@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+ grpc:
+ path: ../..
diff --git a/example/helloworld/helloworld.iml b/example/helloworld/helloworld.iml
new file mode 100644
index 00000000..389d07a1
--- /dev/null
+++ b/example/helloworld/helloworld.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/example/helloworld/pubspec_overrides.yaml b/example/helloworld/pubspec_overrides.yaml
new file mode 100644
index 00000000..c6917691
--- /dev/null
+++ b/example/helloworld/pubspec_overrides.yaml
@@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+ grpc:
+ path: ../..
diff --git a/example/metadata/metadata.iml b/example/metadata/metadata.iml
new file mode 100644
index 00000000..389d07a1
--- /dev/null
+++ b/example/metadata/metadata.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/example/metadata/pubspec_overrides.yaml b/example/metadata/pubspec_overrides.yaml
new file mode 100644
index 00000000..c6917691
--- /dev/null
+++ b/example/metadata/pubspec_overrides.yaml
@@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+ grpc:
+ path: ../..
diff --git a/example/route_guide/pubspec_overrides.yaml b/example/route_guide/pubspec_overrides.yaml
new file mode 100644
index 00000000..c6917691
--- /dev/null
+++ b/example/route_guide/pubspec_overrides.yaml
@@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+ grpc:
+ path: ../..
diff --git a/example/route_guide/route_guide.iml b/example/route_guide/route_guide.iml
new file mode 100644
index 00000000..389d07a1
--- /dev/null
+++ b/example/route_guide/route_guide.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/grpc.iml b/grpc.iml
new file mode 100644
index 00000000..74e5a876
--- /dev/null
+++ b/grpc.iml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/interop/interop.iml b/interop/interop.iml
new file mode 100644
index 00000000..389d07a1
--- /dev/null
+++ b/interop/interop.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/interop/pubspec.yaml b/interop/pubspec.yaml
index f4038fae..40b946a4 100644
--- 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
diff --git a/interop/pubspec_overrides.yaml b/interop/pubspec_overrides.yaml
new file mode 100644
index 00000000..917447a4
--- /dev/null
+++ b/interop/pubspec_overrides.yaml
@@ -0,0 +1,4 @@
+# melos_managed_dependency_overrides: grpc
+dependency_overrides:
+ grpc:
+ path: ..
diff --git a/pubspec.yaml b/pubspec.yaml
index a01ce0ec..48013199 100644
--- 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
diff --git a/test/client_tests/client_keepalive_manager_test.mocks.dart b/test/client_tests/client_keepalive_manager_test.mocks.dart
index 941de6a6..f03f3cb6 100644
--- 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(
diff --git a/test/connection_server_test.dart b/test/connection_server_test.dart
index 16969c15..4ced9bf9 100644
--- 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;
diff --git a/test/server_test.dart b/test/server_test.dart
index 63a957c0..2de494d3 100644
--- 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;
diff --git a/test/src/client_utils.mocks.dart b/test/src/client_utils.mocks.dart
index 98702df4..8da129c0 100644
--- 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 get onInitialPeerSettingsReceived => (super.noSuchMethod(
Invocation.getter(#onInitialPeerSettingsReceived),
returnValue: _i3.Future.value(),
) as _i3.Future);
+
@override
_i3.Stream get onPingReceived => (super.noSuchMethod(
Invocation.getter(#onPingReceived),
returnValue: _i3.Stream.empty(),
) as _i3.Stream);
+
@override
_i3.Stream get onFrameReceived => (super.noSuchMethod(
Invocation.getter(#onFrameReceived),
returnValue: _i3.Stream.empty(),
) as _i3.Stream);
+
@override
_i2.ClientTransportStream makeRequest(
List<_i4.Header>? headers, {
@@ -101,6 +106,7 @@ class MockClientTransportConnection extends _i1.Mock
),
),
) as _i2.ClientTransportStream);
+
@override
_i3.Future ping() => (super.noSuchMethod(
Invocation.method(
@@ -109,6 +115,7 @@ class MockClientTransportConnection extends _i1.Mock
),
returnValue: _i3.Future.value(),
) as _i3.Future);
+
@override
_i3.Future finish() => (super.noSuchMethod(
Invocation.method(
@@ -117,6 +124,7 @@ class MockClientTransportConnection extends _i1.Mock
),
returnValue: _i3.Future.value(),
) as _i3.Future);
+
@override
_i3.Future 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? bytes, {