Skip to content

Commit

Permalink
Copy of changes in flutter#147250
Browse files Browse the repository at this point in the history
  • Loading branch information
elliette committed Apr 29, 2024
1 parent 257df5e commit 48b76fd
Show file tree
Hide file tree
Showing 29 changed files with 88 additions and 94 deletions.
4 changes: 2 additions & 2 deletions dev/benchmarks/multiple_flutters/module/pubspec.yaml
Expand Up @@ -36,7 +36,7 @@ dependencies:
term_glyph: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

flutter:
Expand All @@ -47,4 +47,4 @@ flutter:
androidPackage: com.example.multiple_flutters_module
iosBundleIdentifier: com.example.multipleFluttersModule

# PUBSPEC CHECKSUM: e6e1
# PUBSPEC CHECKSUM: 18e2
4 changes: 2 additions & 2 deletions dev/bots/pubspec.yaml
Expand Up @@ -38,7 +38,7 @@ dependencies:
http_multi_server: 3.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
io: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
js: 0.7.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.16+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
metrics_center: 1.0.13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand Down Expand Up @@ -75,4 +75,4 @@ dependencies:
dev_dependencies:
test_api: 0.7.1

# PUBSPEC CHECKSUM: df09
# PUBSPEC CHECKSUM: e309
4 changes: 2 additions & 2 deletions dev/devicelab/pubspec.yaml
Expand Up @@ -36,7 +36,7 @@ dependencies:
googleapis: 12.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
googleapis_auth: 1.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
http_parser: 4.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
petitparser: 6.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
pub_semver: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand Down Expand Up @@ -73,4 +73,4 @@ dev_dependencies:
watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
web_socket_channel: 2.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

# PUBSPEC CHECKSUM: 8376
# PUBSPEC CHECKSUM: 8776
4 changes: 2 additions & 2 deletions dev/integration_tests/android_views/pubspec.yaml
Expand Up @@ -47,7 +47,7 @@ dependencies:
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service: 14.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
webdriver: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

dev_dependencies:
Expand Down Expand Up @@ -95,4 +95,4 @@ dev_dependencies:
flutter:
uses-material-design: true

# PUBSPEC CHECKSUM: 1e59
# PUBSPEC CHECKSUM: 655a
4 changes: 2 additions & 2 deletions dev/integration_tests/gradle_deprecated_settings/pubspec.yaml
Expand Up @@ -10,7 +10,7 @@ dependencies:
camera: 0.10.5+9
camera_android: 0.10.8+17

camera_avfoundation: 0.9.15+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
camera_avfoundation: 0.9.16 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
camera_platform_interface: 2.7.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
camera_web: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand All @@ -27,4 +27,4 @@ dependencies:
flutter:
uses-material-design: true

# PUBSPEC CHECKSUM: b799
# PUBSPEC CHECKSUM: 223b
4 changes: 2 additions & 2 deletions dev/integration_tests/hybrid_android_views/pubspec.yaml
Expand Up @@ -45,7 +45,7 @@ dependencies:
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service: 14.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
webdriver: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

dev_dependencies:
Expand Down Expand Up @@ -93,4 +93,4 @@ dev_dependencies:
flutter:
uses-material-design: true

# PUBSPEC CHECKSUM: 1e59
# PUBSPEC CHECKSUM: 655a
4 changes: 2 additions & 2 deletions dev/integration_tests/new_gallery/pubspec.yaml
Expand Up @@ -60,7 +60,7 @@ dependencies:
url_launcher_web: 2.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
url_launcher_windows: 3.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
web: 0.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

dev_dependencies:
Expand Down Expand Up @@ -312,4 +312,4 @@ flutter:
fonts:
- asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf

# PUBSPEC CHECKSUM: fd6d
# PUBSPEC CHECKSUM: 456e
2 changes: 1 addition & 1 deletion packages/flutter_tools/lib/src/isolated/devfs_web.dart
Expand Up @@ -292,7 +292,7 @@ class WebAssetServer implements AssetReader {
},
toolConfiguration: ToolConfiguration(
loadStrategy: ddcModuleSystem
? FrontendServerLegacyStrategyProvider(
? FrontendServerDdcStrategyProvider(
ReloadConfiguration.none,
server,
PackageUriMapper(packageConfig),
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/lib/src/update_packages_pins.dart
Expand Up @@ -30,4 +30,5 @@ const Map<String, String> kManuallyPinnedDependencies = <String, String>{
'path_provider_android':
'2.2.1', // https://github.com/flutter/flutter/issues/140796
'camera_android': '0.10.8+17', // https://github.com/flutter/flutter/issues/146004
'dds': '4.1.0', // https://github.com/dart-lang/sdk/issues/55559
};
18 changes: 9 additions & 9 deletions packages/flutter_tools/pubspec.yaml
Expand Up @@ -13,8 +13,8 @@ dependencies:
archive: 3.3.2
args: 2.5.0
browser_launcher: 1.1.1
dds: 3.4.0
dwds: 23.3.0
dds: 4.1.0
dwds: 24.0.0
completion: 1.0.1
coverage: 1.7.2
crypto: 3.0.3
Expand Down Expand Up @@ -52,7 +52,7 @@ dependencies:
http_multi_server: 3.2.1
convert: 3.1.1
async: 2.11.0
unified_analytics: 5.8.8+1
unified_analytics: 6.1.0

cli_config: 0.2.0
graphs: 2.3.1
Expand All @@ -77,9 +77,9 @@ dependencies:
clock: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
csslib: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dap: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dds_service_extensions: 1.7.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
devtools_shared: 8.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dtd: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dds_service_extensions: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
devtools_shared: 9.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dtd: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
extension_discovery: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
fixnum: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
frontend_server_client: 4.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand All @@ -100,7 +100,7 @@ dependencies:
sync_http: 0.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_interface: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_interface: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
web: 0.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
yaml_edit: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand All @@ -112,12 +112,12 @@ dev_dependencies:

checked_yaml: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
js: 0.7.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 1.25.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

dartdoc:
# Exclude this package from the hosted API docs.
nodoc: true

# PUBSPEC CHECKSUM: 1789
# PUBSPEC CHECKSUM: c116
Expand Up @@ -70,7 +70,7 @@ final Platform notMacosPlatform = FakePlatform(
);

void main() {
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late TestUsage usage;
late FakeAnalytics fakeAnalytics;
late BufferLogger logger;
Expand Down
Expand Up @@ -72,7 +72,7 @@ class FakePlistUtils extends Fake implements PlistParser {
}

void main() {
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late TestUsage usage;
late FakeProcessManager fakeProcessManager;
late ProcessUtils processUtils;
Expand Down
Expand Up @@ -64,7 +64,7 @@ final Platform notMacosPlatform = FakePlatform(
);

void main() {
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late TestUsage usage;
late FakeProcessManager fakeProcessManager;
late ProcessUtils processUtils;
Expand Down
Expand Up @@ -45,7 +45,7 @@ final Platform notWindowsPlatform = FakePlatform(
);

void main() {
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late ProcessManager processManager;
late TestUsage usage;
late FakeAnalytics fakeAnalytics;
Expand Down
Expand Up @@ -46,7 +46,7 @@ void main() {
late BufferLogger logger;
late TestUsage testUsage;
late FakeAnalytics fakeAnalytics;
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late FakeProcessManager processManager;

setUp(() {
Expand Down
Expand Up @@ -15,7 +15,7 @@ import '../../src/common.dart';
import '../../src/fakes.dart';

void main() {
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late FakeAnalytics fakeAnalytics;

setUp(() {
Expand Down
Expand Up @@ -42,7 +42,7 @@ const List<String> _kSharedConfig = <String>[

void main() {
late Environment environment;
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late FakeProcessManager processManager;
late Artifacts artifacts;
late BufferLogger logger;
Expand Down
Expand Up @@ -21,7 +21,7 @@ import '../../../src/fakes.dart';

void main() {
late Environment environment;
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late Artifacts artifacts;
late FakeProcessManager processManager;
late File binary;
Expand Down
6 changes: 3 additions & 3 deletions packages/flutter_tools/test/general.shard/hot_test.dart
Expand Up @@ -109,7 +109,7 @@ void main() {

group('hotRestart', () {
final FakeResidentCompiler residentCompiler = FakeResidentCompiler();
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late TestUsage testUsage;
late FakeAnalytics fakeAnalytics;

Expand Down Expand Up @@ -534,7 +534,7 @@ void main() {
});

group('hot attach', () {
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late FakeAnalytics fakeAnalytics;

setUp(() {
Expand Down Expand Up @@ -578,7 +578,7 @@ void main() {
});

group('hot cleanupAtFinish()', () {
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late FakeAnalytics fakeAnalytics;

setUp(() {
Expand Down
Expand Up @@ -27,7 +27,7 @@ import 'fake_native_assets_build_runner.dart';
void main() {
group('native assets', () {
late TestHotRunnerConfig testingConfig;
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late FakeAnalytics fakeAnalytics;

setUp(() {
Expand Down
Expand Up @@ -2,17 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.


import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/features.dart';
import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:flutter_tools/src/resident_devtools_handler.dart';
import 'package:flutter_tools/src/resident_runner.dart';
import 'package:flutter_tools/src/run_hot.dart';
import 'package:test/fake.dart';
import 'package:unified_analytics/unified_analytics.dart';

import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fake_vm_services.dart';
import '../../src/fakes.dart';
Expand All @@ -22,43 +21,18 @@ import 'fake_native_assets_build_runner.dart';

void main() {
late Testbed testbed;
late FakeFlutterDevice flutterDevice;
late FakeDevFS devFS;
late ResidentRunner residentRunner;
late FakeDevice device;
late FakeAnalytics fakeAnalytics;
FakeVmServiceHost? fakeVmServiceHost;

setUp(() {
testbed = Testbed(setup: () {
fakeAnalytics = getInitializedFakeAnalyticsInstance(
fs: globals.fs,
fakeFlutterVersion: FakeFlutterVersion(),
);

globals.fs.file('.packages')
.writeAsStringSync('\n');
globals.fs.file(globals.fs.path.join('build', 'app.dill'))
..createSync(recursive: true)
..writeAsStringSync('ABC');
residentRunner = HotRunner(
<FlutterDevice>[
flutterDevice,
],
stayResident: false,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
target: 'main.dart',
devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics,
);
});
device = FakeDevice();
devFS = FakeDevFS();
flutterDevice = FakeFlutterDevice()
..testUri = testUri
..vmServiceHost = (() => fakeVmServiceHost)
..device = device
..fakeDevFS = devFS;
});

testUsingContext(
Expand All @@ -85,7 +59,7 @@ void main() {
.file(globals.fs.path.join('lib', 'main.dart'))
.createSync(recursive: true);
final FakeNativeAssetsBuildRunner buildRunner = FakeNativeAssetsBuildRunner();
residentRunner = HotRunner(
final HotRunner residentRunner = HotRunner(
<FlutterDevice>[
flutterDevice,
],
Expand All @@ -99,11 +73,11 @@ void main() {
target: 'main.dart',
devtoolsHandler: createNoOpHandler,
nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner),
analytics: fakeAnalytics,
analytics: FakeAnalytics(),
nativeAssetsYamlFile: 'foo.yaml',
);

final int? result = await residentRunner.run();
final int result = await residentRunner.run();
expect(result, 0);

expect(buildRunner.buildInvocations, 0);
Expand All @@ -119,3 +93,10 @@ void main() {
FeatureFlags: () => TestFeatureFlags(isNativeAssetsEnabled: true, isMacOSEnabled: true),
});
}

class FakeAnalytics extends Fake implements Analytics {
@override
void send(Event event) => sentEvents.add(event);

final List<Event> sentEvents = <Event>[];
}
Expand Up @@ -29,7 +29,7 @@ enum _StdioStream {
}

void main() {
late FileSystem fileSystem;
late MemoryFileSystem fileSystem;
late FakeProcessManager fakeProcessManager;
late CocoaPods cocoaPodsUnderTest;
late BufferLogger logger;
Expand Down

0 comments on commit 48b76fd

Please sign in to comment.