True Upstream Master

open-runtime · Jan 3, 2025 · 1632820 · 1632820
1 parent 1dddfe0
commit 1632820
Show file tree

Hide file tree

Showing 23 changed files with 193 additions and 236 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
   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.
 
 ## 4.0.1
 

diff --git a/example/googleapis/googleapis.iml b/example/googleapis/googleapis.iml
diff --git a/example/googleapis/pubspec_overrides.yaml b/example/googleapis/pubspec_overrides.yaml
diff --git a/example/grpc-web/grpc_web.iml b/example/grpc-web/grpc_web.iml
diff --git a/example/grpc-web/pubspec_overrides.yaml b/example/grpc-web/pubspec_overrides.yaml
diff --git a/example/helloworld/helloworld.iml b/example/helloworld/helloworld.iml
diff --git a/example/helloworld/pubspec_overrides.yaml b/example/helloworld/pubspec_overrides.yaml
diff --git a/example/metadata/metadata.iml b/example/metadata/metadata.iml
diff --git a/example/metadata/pubspec_overrides.yaml b/example/metadata/pubspec_overrides.yaml
diff --git a/example/route_guide/pubspec_overrides.yaml b/example/route_guide/pubspec_overrides.yaml
diff --git a/example/route_guide/route_guide.iml b/example/route_guide/route_guide.iml
diff --git a/grpc.iml b/grpc.iml
diff --git a/interop/interop.iml b/interop/interop.iml
diff --git 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 <4.0.0'
+  sdk: ^3.0.0
 
 dependencies:
-  args: ^2.5.0
-  async: ^2.11.0
-  collection: ^1.18.0
+  args: ^2.0.0
+  async: ^2.2.0
+  collection: ^1.14.11
   grpc:
     path: ../
-  protobuf: ^3.1.0
+  protobuf: ^3.0.0
 
 dev_dependencies:
-  test: ^1.25.3
+  test: ^1.16.0
diff --git a/interop/pubspec_overrides.yaml b/interop/pubspec_overrides.yaml
diff --git a/lib/grpc_or_grpcweb.dart b/lib/grpc_or_grpcweb.dart
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 import 'src/client/grpc_or_grpcweb_channel_grpc.dart'
-    if (dart.library.html) 'src/client/grpc_or_grpcweb_channel_web.dart';
+    if (dart.library.js_interop) 'src/client/grpc_or_grpcweb_channel_web.dart';
 import 'src/client/http2_channel.dart';
 import 'src/client/options.dart';