Skip to content

Commit 0e4107e

Browse files
author
Hidenori Matsubayashi
authored
1 parent fad1d30 commit 0e4107e

6 files changed

+7
-8
lines changed

bin/internal/engine.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d3ea636dc5d16b56819f3266241e1f708979c233
1+
40a99c595137e4b2f5b2efa8ff343ea23c1e16b8

bin/internal/flutter.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18116933e77adc82f80866c928266a5b4f1ed645
1+
cf4400006550b70f28e4b4af815151d1e74846c6

lib/commands/upgrade.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,12 @@ class ELinuxUpgradeCommandRunner {
279279
/// Source: [runCommandSecondHalf] in `upgrade.dart`
280280
Future<void> runCommandSecondHalf() async {
281281
// Make sure the welcome message re-display is delayed until the end.
282-
globals.persistentToolState.redisplayWelcomeMessage = false;
282+
globals.persistentToolState.setShouldRedisplayWelcomeMessage(false);
283283
await precacheArtifacts();
284284
await updatePackages();
285285
await runDoctor();
286286
// Force the welcome message to re-display following the upgrade.
287-
globals.persistentToolState.redisplayWelcomeMessage = true;
287+
globals.persistentToolState.setShouldRedisplayWelcomeMessage(true);
288288
}
289289

290290
/// Source: [precacheArtifacts] in `upgrade.dart`

lib/elinux_device.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ class ELinuxDevice extends Device {
164164
final ProtocolDiscovery discovery = ProtocolDiscovery.observatory(
165165
_logReader,
166166
portForwarder: _config.usesPortForwarding ? portForwarder : null,
167-
hostPort: null,
168-
devicePort: null,
167+
hostPort: debuggingOptions?.hostVmServicePort,
168+
devicePort: debuggingOptions?.deviceVmServicePort,
169169
logger: _logger,
170170
ipv6: ipv6,
171171
);

lib/elinux_remote_devices_config.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class ELinuxRemoteDevicesConfig {
7777
for (final MapEntry<int, dynamic> entry in typedList.asMap().entries) {
7878
try {
7979
revived.add(ELinuxRemoteDeviceConfig.fromJson(entry.value));
80-
} on ELinuxRemoteDeviceRevivalException catch (e) {
80+
} on ELinuxRemoteDeviceRevivalException catch (_) {
8181
// TODO(hidenori): Corrensponds to the format difference
8282
// from the default schema and uncooment here.
8383
//

lib/executable.dart

-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ Future<void> main(List<String> args) async {
141141
stdio: globals.stdio,
142142
terminal: globals.terminal,
143143
outputPreferences: globals.outputPreferences,
144-
stopwatchFactory: const StopwatchFactory(),
145144
)),
146145
},
147146
);

0 commit comments

Comments
 (0)