diff --git a/Makefile b/Makefile index 0b6ed5c9..473f8d42 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,33 @@ keys: mkdir -p /tmp/codegen yq -o=json eval assets/langs/en.yaml -P > /tmp/codegen/en.json - flutter pub run easy_localization:generate -S /tmp/codegen -f keys -o locale_keys.g.dart + ./flutterw pub run easy_localization:generate -S /tmp/codegen -f keys -o locale_keys.g.dart dart format lib/generated - flutter pub run import_sorter:main lib/generated/* + ./flutterw pub run import_sorter:main lib/generated/* protos: protoc --dart_out=grpc:lib/analytics/generated -Ilib/analytics/ lib/analytics/analytics.proto protoc --dart_out=grpc:lib/generated -Iprotos protos/shared_preferences.proto dart format lib/generated - flutter pub run import_sorter:main lib/generated/* + ./flutterw pub run import_sorter:main lib/generated/* unused: - flutter pub run dart_code_metrics:metrics check-unused-files lib + ./flutterw pub run dart_code_metrics:metrics check-unused-files lib fmt: - flutter pub run import_sorter:main + ./flutterw pub run import_sorter:main lint: - flutter pub run dart_code_metrics:metrics lib + ./flutterw pub run dart_code_metrics:metrics lib build_env: dart scripts/setup_env.dart gen build_runner: - flutter packages pub run build_runner build --delete-conflicting-outputs + ./flutterw packages pub run build_runner build --delete-conflicting-outputs test: - flutter test + ./flutterw test # https://stackoverflow.com/a/26339924/147435 .PHONY: list test diff --git a/scripts/flutter_run.sh b/scripts/flutter_run.sh index d9cb6e15..9f2362fa 100755 --- a/scripts/flutter_run.sh +++ b/scripts/flutter_run.sh @@ -22,10 +22,10 @@ if [[ $DEVICE_TARGET == *"android"* ]]; then echo echo "flutter run -d $DEVICE_ID --flavor dev --track-widget-creation" echo - flutter run -d "$DEVICE_ID" --flavor dev --track-widget-creation + ./flutterw run -d "$DEVICE_ID" --flavor dev --track-widget-creation else echo echo "flutter run -d $DEVICE_ID --track-widget-creation" echo - flutter run -d "$DEVICE_ID" --track-widget-creation + ./flutterw run -d "$DEVICE_ID" --track-widget-creation fi