Skip to content

Merging AOT Monorepo Compat into our Main Branch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 3, 2025
Merged

Merging AOT Monorepo Compat into our Main Branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb27707
Bring all dep paths local for melos deps override
tsavo-at-pieces Mar 15, 2024
17b4f2a
Melos Yaml is looking G2G
tsavo-at-pieces Mar 15, 2024
b6e103f
External Dependencies
tsavo-at-pieces Mar 19, 2024
a04061b
feat: Initial testing & debugging of _UnixNamedLock
tsavo-at-pieces Mar 27, 2024
33381e0
Update Deps
tsavo-at-pieces Apr 11, 2024
a2981c4
Add Dart Constraint
tsavo-at-pieces Apr 11, 2024
25ea43a
Update Deps & Refactor
tsavo-at-pieces Apr 12, 2024
bb25121
Update pubspec.yaml
tsavo-at-pieces Apr 12, 2024
00eabed
chore: Update Deps
tsavo-at-pieces Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions example/googleapis/googleapis.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 4 additions & 0 deletions example/googleapis/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# melos_managed_dependency_overrides: grpc
dependency_overrides:
grpc:
path: ../..
16 changes: 16 additions & 0 deletions example/grpc-web/grpc_web.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 4 additions & 0 deletions example/grpc-web/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# melos_managed_dependency_overrides: grpc
dependency_overrides:
grpc:
path: ../..
16 changes: 16 additions & 0 deletions example/helloworld/helloworld.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 4 additions & 0 deletions example/helloworld/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# melos_managed_dependency_overrides: grpc
dependency_overrides:
grpc:
path: ../..
16 changes: 16 additions & 0 deletions example/metadata/metadata.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 4 additions & 0 deletions example/metadata/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# melos_managed_dependency_overrides: grpc
dependency_overrides:
grpc:
path: ../..
4 changes: 4 additions & 0 deletions example/route_guide/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# melos_managed_dependency_overrides: grpc
dependency_overrides:
grpc:
path: ../..
16 changes: 16 additions & 0 deletions example/route_guide/route_guide.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
18 changes: 18 additions & 0 deletions grpc.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
16 changes: 16 additions & 0 deletions interop/interop.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 6 additions & 6 deletions interop/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions interop/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# melos_managed_dependency_overrides: grpc
dependency_overrides:
grpc:
path: ..
31 changes: 15 additions & 16 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions test/client_tests/client_keepalive_manager_test.mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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
Expand All @@ -32,6 +32,7 @@ class MockPinger extends _i1.Mock implements _i2.Pinger {
),
returnValueForMissingStub: null,
);

@override
void onPingTimeout() => super.noSuchMethod(
Invocation.method(
Expand Down
4 changes: 2 additions & 2 deletions test/connection_server_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions test/server_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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;
Expand Down
Loading