diff --git a/ci/analyze.sh b/ci/analyze.sh index e92ad3930398a..93aac71198732 100755 --- a/ci/analyze.sh +++ b/ci/analyze.sh @@ -58,24 +58,22 @@ echo "Using dart from $DART_BIN" "$DART" --version echo "" -"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/ci" -"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/flutter_frontend_server" -"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/impeller/tessellator/dart" -"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/lib/gpu" -"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/lib/ui" -"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/testing" -"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/tools" - +# The web SDK does not use pub_get_offline.py, so we need to run pub get first: +echo "Running 'pub get' in the Web SDK" echo "" - -# Check that dart libraries conform. -echo "Checking the integrity of the Web SDK" +(cd "$FLUTTER_DIR/lib/web_ui"; "$DART" pub --suppress-analytics get) (cd "$FLUTTER_DIR/web_sdk"; "$DART" pub --suppress-analytics get) (cd "$FLUTTER_DIR/web_sdk/web_test_utils"; "$DART" pub --suppress-analytics get) (cd "$FLUTTER_DIR/web_sdk/web_engine_tester"; "$DART" pub --suppress-analytics get) -"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/web_sdk" +# Check *all* the Dart code in the engine. +echo "Analyzing the Flutter engine" +echo "" +"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR" +echo "" +# Check that dart libraries conform. +echo "Checking the integrity of the Web SDK" WEB_SDK_TEST_FILES="$FLUTTER_DIR/web_sdk/test/*" for testFile in $WEB_SDK_TEST_FILES do diff --git a/impeller/fixtures/dart_tests.dart b/impeller/fixtures/dart_tests.dart index 2609d70f0d1c2..f1e9f231473fc 100644 --- a/impeller/fixtures/dart_tests.dart +++ b/impeller/fixtures/dart_tests.dart @@ -3,13 +3,15 @@ // found in the LICENSE file. import 'dart:typed_data'; -import 'dart:ui' as ui; + +// ignore: avoid_relative_lib_imports import '../../lib/gpu/lib/gpu.dart' as gpu; void main() {} @pragma('vm:entry-point') void sayHi() { + // ignore: avoid_print print('Hi'); } diff --git a/lib/web_ui/pubspec.yaml b/lib/web_ui/pubspec.yaml index 91a890ea85c7f..b391eab26a713 100644 --- a/lib/web_ui/pubspec.yaml +++ b/lib/web_ui/pubspec.yaml @@ -7,7 +7,7 @@ environment: dependencies: js: ^0.7.0 - meta: ^1.7.0 + meta: ^1.14.0 web_locale_keymap: path: ../../third_party/web_locale_keymap diff --git a/sky/packages/sky_engine/pubspec.yaml b/sky/packages/sky_engine/pubspec.yaml index 08863df240e90..e0648ded011cd 100644 --- a/sky/packages/sky_engine/pubspec.yaml +++ b/sky/packages/sky_engine/pubspec.yaml @@ -1,8 +1,3 @@ name: sky_engine -version: 0.0.99 -author: Flutter Authors -description: Dart SDK extensions for dart:ui -homepage: http://flutter.io -# sky_engine requires sdk_ext support in the analyzer which was added in 1.11.x environment: sdk: '>=3.2.0-0 <4.0.0'