From c828a6c7e1d54e93d5c87a6e77cbdf8f99df4961 Mon Sep 17 00:00:00 2001 From: bryanoltman Date: Tue, 21 Jan 2025 22:57:10 -0500 Subject: [PATCH 1/3] Remove redundant Windows shorebird.yaml update --- .../lib/src/windows/build_windows.dart | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/flutter_tools/lib/src/windows/build_windows.dart b/packages/flutter_tools/lib/src/windows/build_windows.dart index c512582b960cd..1a4371e655b0d 100644 --- a/packages/flutter_tools/lib/src/windows/build_windows.dart +++ b/packages/flutter_tools/lib/src/windows/build_windows.dart @@ -135,14 +135,14 @@ Future buildWindows( .childDirectory('flutter_assets') .childFile('shorebird.yaml'); - if (shorebirdYamlFile.existsSync()) { - try { - updateShorebirdYaml(buildInfo.flavor, shorebirdYamlFile.path, environment: globals.platform.environment); - } on Exception catch (error) { - globals.printError('[shorebird] failed to generate shorebird configuration.\n$error'); - throw Exception('Failed to generate shorebird configuration'); - } - } + // if (shorebirdYamlFile.existsSync()) { + // try { + // updateShorebirdYaml(buildInfo.flavor, shorebirdYamlFile.path, environment: globals.platform.environment); + // } on Exception catch (error) { + // globals.printError('[shorebird] failed to generate shorebird configuration.\n$error'); + // throw Exception('Failed to generate shorebird configuration'); + // } + // } if (buildInfo.codeSizeDirectory != null && sizeAnalyzer != null) { final String arch = getNameForTargetPlatform(targetPlatform); From 3305c6de99ed63a93ae1b3673cdcfc651e047b57 Mon Sep 17 00:00:00 2001 From: bryanoltman Date: Tue, 21 Jan 2025 22:59:19 -0500 Subject: [PATCH 2/3] remove comments --- .../flutter_tools/lib/src/windows/build_windows.dart | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/flutter_tools/lib/src/windows/build_windows.dart b/packages/flutter_tools/lib/src/windows/build_windows.dart index 1a4371e655b0d..059cebf5d8317 100644 --- a/packages/flutter_tools/lib/src/windows/build_windows.dart +++ b/packages/flutter_tools/lib/src/windows/build_windows.dart @@ -135,15 +135,6 @@ Future buildWindows( .childDirectory('flutter_assets') .childFile('shorebird.yaml'); - // if (shorebirdYamlFile.existsSync()) { - // try { - // updateShorebirdYaml(buildInfo.flavor, shorebirdYamlFile.path, environment: globals.platform.environment); - // } on Exception catch (error) { - // globals.printError('[shorebird] failed to generate shorebird configuration.\n$error'); - // throw Exception('Failed to generate shorebird configuration'); - // } - // } - if (buildInfo.codeSizeDirectory != null && sizeAnalyzer != null) { final String arch = getNameForTargetPlatform(targetPlatform); final File codeSizeFile = globals.fs.directory(buildInfo.codeSizeDirectory) From 05cf6fbe5dd81051ccbfab6a6a17cf2f414111c3 Mon Sep 17 00:00:00 2001 From: bryanoltman Date: Tue, 21 Jan 2025 23:00:19 -0500 Subject: [PATCH 3/3] remove unused var --- packages/flutter_tools/lib/src/windows/build_windows.dart | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/flutter_tools/lib/src/windows/build_windows.dart b/packages/flutter_tools/lib/src/windows/build_windows.dart index 059cebf5d8317..b83a00462a21c 100644 --- a/packages/flutter_tools/lib/src/windows/build_windows.dart +++ b/packages/flutter_tools/lib/src/windows/build_windows.dart @@ -128,12 +128,6 @@ Future buildWindows( 'Built ${globals.fs.path.relative(buildOutput.path)}', color: TerminalColor.green, ); - final File shorebirdYamlFile = buildDirectory - .childDirectory('runner') - .childDirectory(sentenceCase(buildModeName)) - .childDirectory('data') - .childDirectory('flutter_assets') - .childFile('shorebird.yaml'); if (buildInfo.codeSizeDirectory != null && sizeAnalyzer != null) { final String arch = getNameForTargetPlatform(targetPlatform);