Skip to content

Commit ec2c3fe

Browse files
bderoengine-flutter-autoroll
authored andcommitted
Fix .packages breakage and roll engine to 83b9a59 (flutter#106584)
* 9508a36 Roll Dart SDK from 692562354d6d to d3b8091c30f0 (1 revision) (flutter/engine#34273) * a2985c0 Roll Fuchsia Linux SDK from F1U6IH2Nf... to aRT7s0Yct... (flutter/engine#34251) * 54867f3 Roll Skia from bdd0205ae470 to 4345a2ea731a (1 revision) (flutter/engine#34268) * 98221a2 Clean up text input configuration in clearTextInputClient (flutter/engine#34209) * b9e02cc Adds a license check shard to CI (flutter/engine#34274) * 1daf7ba [Impeller] Metal:Reset Encoder viewport and scissor rect in case the command specifies no opinion (flutter/engine#34252) * 83b9a59 [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 <[email protected]>
1 parent b1be778 commit ec2c3fe

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

bin/internal/engine.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ea756c55f29a1f1143a17379c70422d5438ad891
1+
83b9a591a3d55d3bb5ccdff8c1919c943a92bb45

bin/internal/fuchsia-linux.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
F1U6IH2NfVsK5l7JlKW_deE1-ApiQdSgyAVr2VC9Y98C
1+
aRT7s0Yct4Lq9GgwT91hdeaKh02yh-YUWqS_Vmy3kowC

packages/flutter_tools/lib/src/build_system/targets/web.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class Dart2JSTarget extends Target {
207207
...sharedCommandOptions,
208208
'-o',
209209
environment.buildDir.childFile('app.dill').path,
210-
'--packages=.packages',
210+
'--packages=.dart_tool/package_config.json',
211211
'--cfe-only',
212212
environment.buildDir.childFile('main.dart').path, // dartfile
213213
]);

packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ void main() {
337337
'--no-source-maps',
338338
'-o',
339339
environment.buildDir.childFile('app.dill').absolute.path,
340-
'--packages=.packages',
340+
'--packages=.dart_tool/package_config.json',
341341
'--cfe-only',
342342
environment.buildDir.childFile('main.dart').absolute.path,
343343
]
@@ -373,7 +373,7 @@ void main() {
373373
'--no-source-maps',
374374
'-o',
375375
environment.buildDir.childFile('app.dill').absolute.path,
376-
'--packages=.packages',
376+
'--packages=.dart_tool/package_config.json',
377377
'--cfe-only',
378378
environment.buildDir.childFile('main.dart').absolute.path,
379379
]
@@ -406,7 +406,7 @@ void main() {
406406
'--no-source-maps',
407407
'-o',
408408
environment.buildDir.childFile('app.dill').absolute.path,
409-
'--packages=.packages',
409+
'--packages=.dart_tool/package_config.json',
410410
'--cfe-only',
411411
environment.buildDir.childFile('main.dart').absolute.path,
412412
]
@@ -438,7 +438,7 @@ void main() {
438438
'--no-source-maps',
439439
'-o',
440440
environment.buildDir.childFile('app.dill').absolute.path,
441-
'--packages=.packages',
441+
'--packages=.dart_tool/package_config.json',
442442
'--cfe-only',
443443
environment.buildDir.childFile('main.dart').absolute.path,
444444
]
@@ -471,7 +471,7 @@ void main() {
471471
'--no-source-maps',
472472
'-o',
473473
environment.buildDir.childFile('app.dill').absolute.path,
474-
'--packages=.packages',
474+
'--packages=.dart_tool/package_config.json',
475475
'--cfe-only',
476476
environment.buildDir.childFile('main.dart').absolute.path,
477477
]
@@ -504,7 +504,7 @@ void main() {
504504
'--no-source-maps',
505505
'-o',
506506
environment.buildDir.childFile('app.dill').absolute.path,
507-
'--packages=.packages',
507+
'--packages=.dart_tool/package_config.json',
508508
'--cfe-only',
509509
environment.buildDir.childFile('main.dart').absolute.path,
510510
]
@@ -535,7 +535,7 @@ void main() {
535535
'--no-source-maps',
536536
'-o',
537537
environment.buildDir.childFile('app.dill').absolute.path,
538-
'--packages=.packages',
538+
'--packages=.dart_tool/package_config.json',
539539
'--cfe-only',
540540
environment.buildDir.childFile('main.dart').absolute.path,
541541
], onRun: () {
@@ -567,7 +567,7 @@ void main() {
567567
'--no-source-maps',
568568
'-o',
569569
environment.buildDir.childFile('app.dill').absolute.path,
570-
'--packages=.packages',
570+
'--packages=.dart_tool/package_config.json',
571571
'--cfe-only',
572572
environment.buildDir.childFile('main.dart').absolute.path,
573573
]
@@ -600,7 +600,7 @@ void main() {
600600
'-Ddart.vm.product=true',
601601
'-o',
602602
environment.buildDir.childFile('app.dill').absolute.path,
603-
'--packages=.packages',
603+
'--packages=.dart_tool/package_config.json',
604604
'--cfe-only',
605605
environment.buildDir.childFile('main.dart').absolute.path,
606606
]
@@ -634,7 +634,7 @@ void main() {
634634
'--no-source-maps',
635635
'-o',
636636
environment.buildDir.childFile('app.dill').absolute.path,
637-
'--packages=.packages',
637+
'--packages=.dart_tool/package_config.json',
638638
'--cfe-only',
639639
environment.buildDir.childFile('main.dart').absolute.path,
640640
]

packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Future<void> _ensureFlutterToolsSnapshot() async {
135135
),
136136
);
137137
final String dotPackages = globals.fs.path.absolute(globals.fs.path.join(
138-
'.packages',
138+
'.dart_tool/package_config.json',
139139
));
140140

141141
final File snapshotFile = globals.fs.file(flutterToolsSnapshotPath);

0 commit comments

Comments
 (0)