Fix .packages breakage and roll engine to 83b9a591a3d5 (#106584)

bdero · engine-flutter-autoroll · web-flow · commit 097c162ccec3 · 2022-06-24T17:27:17.000-07:00
* 9508a368d Roll Dart SDK from 692562354d6d to d3b8091c30f0 (1 revision) (flutter/engine#34273) * a2985c034 Roll Fuchsia Linux SDK from F1U6IH2Nf... to aRT7s0Yct... (flutter/engine#34251) * 54867f360 Roll Skia from bdd0205ae470 to 4345a2ea731a (1 revision) (flutter/engine#34268) * 98221a22d Clean up text input configuration in clearTextInputClient (flutter/engine#34209) * b9e02cc83 Adds a license check shard to CI (flutter/engine#34274) * 1daf7ba98 [Impeller] Metal:Reset Encoder viewport and scissor rect in case the command specifies no opinion (flutter/engine#34252) * 83b9a591a [Linux] remove duplicate clone_string() in favor of g_strdup() (flutter/engine#34031) * Don't use .packages * Another attempt Co-authored-by: engine-flutter-autoroll <engine-flutter-autoroll@skia.org>
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-ea756c55f29a1f1143a17379c70422d5438ad891
+83b9a591a3d55d3bb5ccdff8c1919c943a92bb45
diff --git a/bin/internal/fuchsia-linux.version b/bin/internal/fuchsia-linux.version
@@ -1 +1 @@
-F1U6IH2NfVsK5l7JlKW_deE1-ApiQdSgyAVr2VC9Y98C
+aRT7s0Yct4Lq9GgwT91hdeaKh02yh-YUWqS_Vmy3kowC
diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart
@@ -207,7 +207,7 @@ class Dart2JSTarget extends Target {
       ...sharedCommandOptions,
       '-o',
       environment.buildDir.childFile('app.dill').path,
-      '--packages=.packages',
+      '--packages=.dart_tool/package_config.json',
       '--cfe-only',
       environment.buildDir.childFile('main.dart').path, // dartfile
     ]);
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
@@ -337,7 +337,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
         '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
@@ -373,7 +373,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
         '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
@@ -406,7 +406,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
         '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
@@ -438,7 +438,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
         '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
@@ -471,7 +471,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
         '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
@@ -504,7 +504,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
         '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
@@ -535,7 +535,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
         '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ], onRun: () {
@@ -567,7 +567,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
        '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
@@ -600,7 +600,7 @@ void main() {
         '-Ddart.vm.product=true',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
        '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
@@ -634,7 +634,7 @@ void main() {
         '--no-source-maps',
         '-o',
         environment.buildDir.childFile('app.dill').absolute.path,
-        '--packages=.packages',
+        '--packages=.dart_tool/package_config.json',
         '--cfe-only',
         environment.buildDir.childFile('main.dart').absolute.path,
       ]
diff --git a/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart b/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart
@@ -135,7 +135,7 @@ Future<void> _ensureFlutterToolsSnapshot() async {
     ),
   );
   final String dotPackages = globals.fs.path.absolute(globals.fs.path.join(
-    '.packages',
+    '.dart_tool/package_config.json',
   ));
 
   final File snapshotFile = globals.fs.file(flutterToolsSnapshotPath);

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ea756c55f29a1f1143a17379c70422d5438ad891`
	`1`	`+83b9a591a3d55d3bb5ccdff8c1919c943a92bb45`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-F1U6IH2NfVsK5l7JlKW_deE1-ApiQdSgyAVr2VC9Y98C`
	`1`	`+aRT7s0Yct4Lq9GgwT91hdeaKh02yh-YUWqS_Vmy3kowC`