Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit ae894ef

Browse files
author
Dart CI
committed
Version 2.18.0-139.0.dev
Merge commit '99b67ac0f3c00de167033683a0a0fd489cb8aa45' into 'dev'
2 parents aad56bc + 99b67ac commit ae894ef

File tree

6 files changed

+20
-32
lines changed

6 files changed

+20
-32
lines changed

‎DEPS‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ vars = {
5858
# Checkout extra javascript engines for testing or benchmarking.
5959
# d8, the V8 shell, is always checked out.
6060
"checkout_javascript_engines": False,
61-
"d8_tag": "version:10.2.78",
61+
"d8_tag": "version:10.4.31",
6262
"jsshell_tag": "version:95.0",
6363

6464
# As Flutter does, we use Fuchsia's GN and Clang toolchain. These revision
@@ -124,7 +124,7 @@ vars = {
124124
"linter_rev": "a8529c6692922b45bc287543b355c90d7b1286d3", # 1.24.0
125125
"lints_rev": "8294e5648ab49474541527e2911e72e4c5aefe55",
126126
"logging_rev": "dfbe88b890c3b4f7bc06da5a7b3b43e9e263b688",
127-
"markdown_rev": "7479783f0493f6717e1d7ae31cb37d39a91026b2",
127+
"markdown_rev": "5699cafa9ef004875fd7de8ae9ea00e5295e87a4", # 5.0.0
128128
"markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
129129
"matcher_rev": "07595a7739d47a8315caba5a8e58fb9ae3d81261",
130130
"mime_rev": "c2c5ffd594674f32dc277521369da1557a1622d3",
@@ -135,7 +135,6 @@ vars = {
135135
"platform_rev": "1ffad63428bbd1b3ecaa15926bacfb724023648c",
136136
"ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
137137
"pool_rev": "c40cc32eabecb9d60f1045d1403108d968805f9a",
138-
"process_rev": "2546dfef7ba839b1514e0c9045344692eb47b771",
139138
"protobuf_rev": "b149f801cf7a5e959cf1dbf72d61068ac275f24b",
140139
"pub_rev": "51435efcd574b7bc18d47a5dd620cb9759dea8f8",
141140
"pub_semver_rev": "ea6c54019948dc03042c595ce9413e17aaf7aa38",
@@ -380,8 +379,6 @@ deps = {
380379
Var("dart_git") + "pool.git" + "@" + Var("pool_rev"),
381380
Var("dart_root") + "/third_party/pkg/protobuf":
382381
Var("dart_git") + "protobuf.git" + "@" + Var("protobuf_rev"),
383-
Var("dart_root") + "/third_party/pkg/process":
384-
Var("dart_git") + "process.dart.git" + "@" + Var("process_rev"),
385382
Var("dart_root") + "/third_party/pkg/pub_semver":
386383
Var("dart_git") + "pub_semver.git" + "@" + Var("pub_semver_rev"),
387384
Var("dart_root") + "/third_party/pkg/pub":

‎pkg/dev_compiler/test/sourcemap/stacktrace_testfiles/throw_in_static_method.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ void main() {
1010

1111
class Class {
1212
static void test() {
13-
/*2:Function.test*/ throw '>ExceptionMarker<';
13+
/*2:Class.test*/ throw '>ExceptionMarker<';
1414
}
1515
}

‎pkg/vm_service/pubspec.yaml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ environment:
1212
dependencies:
1313

1414
dev_dependencies:
15-
async: ^2.5.0
15+
async: any
1616
expect: any
1717
lints: any
18-
markdown: ^4.0.0
18+
markdown: any
1919
mockito: any
20-
path: ^1.8.0
21-
process: ^4.0.0
22-
pub_semver: ^2.0.0
23-
test: ^1.16.0
24-
test_package:
25-
path: 'test/test_package'
20+
path: any
21+
pub_semver: any
22+
test: any
23+
test_package: any

‎pkg/vm_service/test/common/test_helper.dart‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'dart:async';
88
import 'dart:convert';
99
import 'dart:io' as io;
1010

11-
import 'package:process/process.dart';
1211
import 'package:test/test.dart';
1312
import 'package:vm_service/vm_service.dart';
1413
import 'package:vm_service/vm_service_io.dart';
@@ -170,11 +169,9 @@ class _ServiceTesteeLauncher {
170169
arguments.insert(0, '-D$k=$v');
171170
});
172171
print('** Launching $bashEnvironment$executable ${arguments.join(' ')}');
173-
return LocalProcessManager().start(
174-
[
175-
executable,
176-
...arguments,
177-
],
172+
return io.Process.start(
173+
executable,
174+
arguments,
178175
environment: environment,
179176
);
180177
}

‎pkg/vm_service/test/process_service_test.dart‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:convert';
77
import 'dart:developer';
88
import 'dart:io' as io;
99

10-
import 'package:process/process.dart';
1110
import 'package:test/test.dart';
1211
import 'package:vm_service/vm_service.dart';
1312

@@ -45,15 +44,12 @@ Future setupProcesses() async {
4544
}
4645

4746
Future<ServiceExtensionResponse> setup(ignored_a, ignored_b) async {
48-
final processManager = LocalProcessManager();
4947
try {
50-
process1 = await processManager.start(
51-
[io.Platform.resolvedExecutable, ...args],
52-
);
53-
process2 = await processManager.start([
48+
process1 = await io.Process.start(io.Platform.resolvedExecutable, args);
49+
process2 = await io.Process.start(
5450
io.Platform.resolvedExecutable,
55-
...(args..add('foobar')),
56-
]);
51+
args..add('foobar'),
52+
);
5753
final codeFilePath = dir.path + io.Platform.pathSeparator + "other_file";
5854
final codeFile = io.File(codeFilePath);
5955
await codeFile.writeAsString('''
@@ -63,11 +59,11 @@ Future setupProcesses() async {
6359
await stdin.drain();
6460
}
6561
''');
66-
process3 = await processManager.start(
62+
process3 = await io.Process.start(
63+
io.Platform.resolvedExecutable,
6764
[
68-
io.Platform.resolvedExecutable,
6965
...io.Platform.executableArguments,
70-
codeFilePath
66+
codeFilePath,
7167
],
7268
);
7369
} catch (_) {

‎tools/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ CHANNEL dev
2727
MAJOR 2
2828
MINOR 18
2929
PATCH 0
30-
PRERELEASE 138
30+
PRERELEASE 139
3131
PRERELEASE_PATCH 0

0 commit comments

Comments
 (0)