firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the signature of DDS launcher callback. (#154949)

Browse Source 
Following https://dart-review.googlesource.com/c/sdk/+/383901
This commit is contained in:
Lau Ching Jun 2024-09-11 10:39:20 -07:00 committed by GitHub
parent b5ce70a760
commit 00b410a466
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter_tools/lib/src/base/dds.dart
View File

@ -28,7 +28,7 @@ typedef DDSLauncherCallback = Future<DartDevelopmentServiceLauncher> Function({
bool enableServicePortFallback, bool enableServicePortFallback,
List<String> cachedUserTags, List<String> cachedUserTags,
String? dartExecutable, String? dartExecutable,
Uri? google3WorkspaceRoot, String? google3WorkspaceRoot,
}); });
// TODO(fujino): This should be direct injected, rather than mutable global state. // TODO(fujino): This should be direct injected, rather than mutable global state.
@ -91,9 +91,7 @@ class DartDevelopmentService with DartDevelopmentServiceLocalOperationsMixin {
? const <String>['AppStartUp'] ? const <String>['AppStartUp']
: const <String>[], : const <String>[],
devToolsServerAddress: devToolsServerAddress, devToolsServerAddress: devToolsServerAddress,
google3WorkspaceRoot: google3WorkspaceRoot != null google3WorkspaceRoot: google3WorkspaceRoot,
? Uri.parse(google3WorkspaceRoot)
: null,
dartExecutable: globals.artifacts!.getArtifactPath( dartExecutable: globals.artifacts!.getArtifactPath(
Artifact.engineDartBinary, Artifact.engineDartBinary,
), ),

2
packages/flutter_tools/test/general.shard/flutter_tester_device_test.dart
View File

@ -277,7 +277,7 @@ void main() {
bool enableServicePortFallback = false, bool enableServicePortFallback = false,
List<String> cachedUserTags = const <String>[], List<String> cachedUserTags = const <String>[],
String? dartExecutable, String? dartExecutable,
Uri? google3WorkspaceRoot, String? google3WorkspaceRoot,
}) async { }) async {
return FakeDartDevelopmentServiceLauncher(uri: Uri.parse('http://localhost:1234')); return FakeDartDevelopmentServiceLauncher(uri: Uri.parse('http://localhost:1234'));
}; };

6
packages/flutter_tools/test/general.shard/resident_runner_test.dart
View File

@ -1947,7 +1947,7 @@ flutter:
bool enableServicePortFallback = false, bool enableServicePortFallback = false,
List<String> cachedUserTags = const <String>[], List<String> cachedUserTags = const <String>[],
String? dartExecutable, String? dartExecutable,
Uri? google3WorkspaceRoot, String? google3WorkspaceRoot,
}) { }) {
throw DartDevelopmentServiceException.existingDdsInstance( throw DartDevelopmentServiceException.existingDdsInstance(
'Existing DDS at http://localhost/existingDdsInMessage.', 'Existing DDS at http://localhost/existingDdsInMessage.',
@ -1996,7 +1996,7 @@ flutter:
bool enableServicePortFallback = false, bool enableServicePortFallback = false,
List<String> cachedUserTags = const <String>[], List<String> cachedUserTags = const <String>[],
String? dartExecutable, String? dartExecutable,
Uri? google3WorkspaceRoot, String? google3WorkspaceRoot,
}) async { }) async {
expect(remoteVmServiceUri, Uri(scheme: 'foo', host: 'bar')); expect(remoteVmServiceUri, Uri(scheme: 'foo', host: 'bar'));
expect(enableAuthCodes, isFalse); expect(enableAuthCodes, isFalse);
@ -2043,7 +2043,7 @@ flutter:
bool enableServicePortFallback = false, bool enableServicePortFallback = false,
List<String> cachedUserTags = const <String>[], List<String> cachedUserTags = const <String>[],
String? dartExecutable, String? dartExecutable,
Uri? google3WorkspaceRoot, String? google3WorkspaceRoot,
}) { }) {
expect(remoteVmServiceUri, Uri(scheme: 'foo', host: 'bar')); expect(remoteVmServiceUri, Uri(scheme: 'foo', host: 'bar'));
expect(enableAuthCodes, isTrue); expect(enableAuthCodes, isTrue);