From a0eb1bc42cab73cf9acb49068a095474b51f023a Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 13 Dec 2024 16:51:47 -0800 Subject: [PATCH] Fix include path in fuchsia's analysis_options.yaml files (flutter/engine#57203) The old path doesn't exist. `dart format` stumbles over this non-existent include. `analysis_options.yaml` files that just imported something non-existent were deleted. I am surprised that this never caused any other issues. Is this all dead code that isn't actually analyzed? --- engine/src/flutter/ci/licenses_golden/excluded_files | 3 --- .../platform/fuchsia/dart-pkg/fuchsia/analysis_options.yaml | 5 ----- .../platform/fuchsia/dart-pkg/zircon/analysis_options.yaml | 5 ----- .../fuchsia/dart_runner/vmservice/analysis_options.yaml | 5 ----- .../platform/fuchsia/flutter/kernel/analysis_options.yaml | 2 +- 5 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/analysis_options.yaml delete mode 100644 engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/analysis_options.yaml delete mode 100644 engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/analysis_options.yaml diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index fb9a86c91b..9d4390de82 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -347,10 +347,8 @@ ../../../flutter/shell/platform/embedder/platform_view_embedder_unittests.cc ../../../flutter/shell/platform/embedder/tests ../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/README.md -../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/analysis_options.yaml ../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/README.md -../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/analysis_options.yaml ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/test ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml @@ -360,7 +358,6 @@ ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.json ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml ../../../flutter/shell/platform/fuchsia/dart_runner/tests -../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/analysis_options.yaml ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml ../../../flutter/shell/platform/fuchsia/flutter/README.md ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc diff --git a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/analysis_options.yaml b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/analysis_options.yaml deleted file mode 100644 index d226629fdd..0000000000 --- a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/analysis_options.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -include: ../../analysis_options.yaml diff --git a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/analysis_options.yaml b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/analysis_options.yaml deleted file mode 100644 index d226629fdd..0000000000 --- a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/analysis_options.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -include: ../../analysis_options.yaml diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/analysis_options.yaml b/engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/analysis_options.yaml deleted file mode 100644 index 704eb990c3..0000000000 --- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/analysis_options.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -include: ../../../tools/analysis_options.yaml diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/analysis_options.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/analysis_options.yaml index 4287055da1..7eb15db6a4 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/analysis_options.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/analysis_options.yaml @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -include: ../../../tools/analysis_options.yaml +include: ../../../../../analysis_options.yaml analyzer: errors: avoid_catches_without_on_clauses: ignore