Skip to content

Commit 00b410a

Browse files
authored
Update the signature of DDS launcher callback. (flutter#154949)
Following https://dart-review.googlesource.com/c/sdk/+/383901
1 parent b5ce70a commit 00b410a

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

packages/flutter_tools/lib/src/base/dds.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ typedef DDSLauncherCallback = Future<DartDevelopmentServiceLauncher> Function({
2828
bool enableServicePortFallback,
2929
List<String> cachedUserTags,
3030
String? dartExecutable,
31-
Uri? google3WorkspaceRoot,
31+
String? google3WorkspaceRoot,
3232
});
3333

3434
// TODO(fujino): This should be direct injected, rather than mutable global state.
@@ -91,9 +91,7 @@ class DartDevelopmentService with DartDevelopmentServiceLocalOperationsMixin {
9191
? const <String>['AppStartUp']
9292
: const <String>[],
9393
devToolsServerAddress: devToolsServerAddress,
94-
google3WorkspaceRoot: google3WorkspaceRoot != null
95-
? Uri.parse(google3WorkspaceRoot)
96-
: null,
94+
google3WorkspaceRoot: google3WorkspaceRoot,
9795
dartExecutable: globals.artifacts!.getArtifactPath(
9896
Artifact.engineDartBinary,
9997
),

packages/flutter_tools/test/general.shard/flutter_tester_device_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ void main() {
277277
bool enableServicePortFallback = false,
278278
List<String> cachedUserTags = const <String>[],
279279
String? dartExecutable,
280-
Uri? google3WorkspaceRoot,
280+
String? google3WorkspaceRoot,
281281
}) async {
282282
return FakeDartDevelopmentServiceLauncher(uri: Uri.parse('http://localhost:1234'));
283283
};

packages/flutter_tools/test/general.shard/resident_runner_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,7 @@ flutter:
19471947
bool enableServicePortFallback = false,
19481948
List<String> cachedUserTags = const <String>[],
19491949
String? dartExecutable,
1950-
Uri? google3WorkspaceRoot,
1950+
String? google3WorkspaceRoot,
19511951
}) {
19521952
throw DartDevelopmentServiceException.existingDdsInstance(
19531953
'Existing DDS at http://localhost/existingDdsInMessage.',
@@ -1996,7 +1996,7 @@ flutter:
19961996
bool enableServicePortFallback = false,
19971997
List<String> cachedUserTags = const <String>[],
19981998
String? dartExecutable,
1999-
Uri? google3WorkspaceRoot,
1999+
String? google3WorkspaceRoot,
20002000
}) async {
20012001
expect(remoteVmServiceUri, Uri(scheme: 'foo', host: 'bar'));
20022002
expect(enableAuthCodes, isFalse);
@@ -2043,7 +2043,7 @@ flutter:
20432043
bool enableServicePortFallback = false,
20442044
List<String> cachedUserTags = const <String>[],
20452045
String? dartExecutable,
2046-
Uri? google3WorkspaceRoot,
2046+
String? google3WorkspaceRoot,
20472047
}) {
20482048
expect(remoteVmServiceUri, Uri(scheme: 'foo', host: 'bar'));
20492049
expect(enableAuthCodes, isTrue);

0 commit comments

Comments
 (0)