diff --git a/.github/actions/setup_flutter/action.yml b/.github/actions/setup_flutter/action.yml deleted file mode 100644 index b432dbc2..00000000 --- a/.github/actions/setup_flutter/action.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Setup Flutter -description: "Setup Flutter" -outputs: - flutter-path: - description: "Flutter SDK path" - value: ${{ steps.install-flutter.outputs.CACHE-PATH }} -runs: - using: "composite" - steps: - - name: Parse Flutter version - id: fvm-config - uses: kuhnroyal/flutter-fvm-config-action@v2 - - - name: Install Flutter - id: install-flutter - uses: subosito/flutter-action@v2 - with: - flutter-version: ${{ steps.fvm-config.outputs.FLUTTER_VERSION }} - channel: ${{ steps.fvm-config.outputs.FLUTTER_CHANNEL }} - cache: true diff --git a/.github/workflows/deploy-ios-production-app.yaml b/.github/workflows/deploy-ios-production-app.yaml index eb4512df..a46c1430 100644 --- a/.github/workflows/deploy-ios-production-app.yaml +++ b/.github/workflows/deploy-ios-production-app.yaml @@ -22,8 +22,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup Flutter - uses: ./.github/actions/setup_flutter + - name: Setup Flutter with FVM + uses: kuhnroyal/flutter-fvm-config-action/setup@v3 - name: Deploy iOS app uses: ./.github/actions/deploy_ios_app diff --git a/.github/workflows/deploy-ios-staging-app.yaml b/.github/workflows/deploy-ios-staging-app.yaml index 0eb97b3c..3f131d62 100644 --- a/.github/workflows/deploy-ios-staging-app.yaml +++ b/.github/workflows/deploy-ios-staging-app.yaml @@ -22,8 +22,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup Flutter - uses: ./.github/actions/setup_flutter + - name: Setup Flutter with FVM + uses: kuhnroyal/flutter-fvm-config-action/setup@v3 - name: Deploy iOS app uses: ./.github/actions/deploy_ios_app diff --git a/.github/workflows/flutter-app-code-check.yml b/.github/workflows/flutter-app-code-check.yml index 0d8b8f3c..e53518b2 100644 --- a/.github/workflows/flutter-app-code-check.yml +++ b/.github/workflows/flutter-app-code-check.yml @@ -49,12 +49,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Flutter + - name: Setup Flutter with FVM id: setup-flutter - uses: ./.github/actions/setup_flutter + uses: kuhnroyal/flutter-fvm-config-action/setup@v3 - name: Prepare Melos - run: echo "MELOS_SDK_PATH=${{ steps.setup-flutter.outputs.flutter-path }}" >> "$GITHUB_ENV" + run: echo "MELOS_SDK_PATH=${{ steps.setup-flutter.outputs.CACHE-PATH }}" >> "$GITHUB_ENV" - name: Install Melos uses: bluefireteam/melos-action@v3 @@ -78,9 +78,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Flutter + - name: Setup Flutter with FVM id: setup-flutter - uses: ./.github/actions/setup_flutter + uses: kuhnroyal/flutter-fvm-config-action/setup@v3 - name: Prepare Melos run: echo "MELOS_SDK_PATH=${{ steps.setup-flutter.outputs.flutter-path }}" >> "$GITHUB_ENV" diff --git a/.github/workflows/pod-install-for-dependabot.yaml b/.github/workflows/pod-install-for-dependabot.yaml index 4add32ef..c5422513 100644 --- a/.github/workflows/pod-install-for-dependabot.yaml +++ b/.github/workflows/pod-install-for-dependabot.yaml @@ -37,18 +37,9 @@ jobs: echo "directory_exists=false" >> "$GITHUB_ENV" fi - - name: Parse Flutter version + - name: Setup Flutter with FVM if: env.directory_exists == 'true' - id: fvm - uses: kuhnroyal/flutter-fvm-config-action@v2 - - - name: Install Flutter - if: env.directory_exists == 'true' - uses: subosito/flutter-action@v2 - with: - flutter-version: ${{ steps.fvm.outputs.FLUTTER_VERSION }} - channel: ${{ steps.fvm.outputs.FLUTTER_CHANNEL }} - cache: true + uses: kuhnroyal/flutter-fvm-config-action/setup@v3 - name: Flutter pub get if: env.directory_exists == 'true' diff --git a/.github/workflows/upload-production-android-app.yaml b/.github/workflows/upload-production-android-app.yaml index 180c3f7f..b10cf296 100644 --- a/.github/workflows/upload-production-android-app.yaml +++ b/.github/workflows/upload-production-android-app.yaml @@ -22,8 +22,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup Flutter - uses: ./.github/actions/setup_flutter + - name: Setup Flutter with FVM + uses: kuhnroyal/flutter-fvm-config-action/setup@v3 - name: Upload android app uses: ./.github/actions/upload_android_app diff --git a/.github/workflows/upload-staging-android-app.yaml b/.github/workflows/upload-staging-android-app.yaml index 20f24740..c9af153f 100644 --- a/.github/workflows/upload-staging-android-app.yaml +++ b/.github/workflows/upload-staging-android-app.yaml @@ -22,8 +22,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup Flutter - uses: ./.github/actions/setup_flutter + - name: Setup Flutter with FVM + uses: kuhnroyal/flutter-fvm-config-action/setup@v3 - name: Upload android app uses: ./.github/actions/upload_android_app diff --git a/.gitignore b/.gitignore index 38babadc..ee049a67 100644 --- a/.gitignore +++ b/.gitignore @@ -121,6 +121,7 @@ unlinked_spec.ds # macOS **/macos/Flutter/GeneratedPluginRegistrant.swift +**/macos/Flutter/ephemeral # Web related lib/generated_plugin_registrant.dart diff --git a/packages/util/analysis_options.yaml b/packages/util/analysis_options.yaml index 4446f0ed..214808a1 100644 --- a/packages/util/analysis_options.yaml +++ b/packages/util/analysis_options.yaml @@ -1 +1,4 @@ include: package:altive_lints/altive_lints.yaml +analyzer: + plugins: + - custom_lint diff --git a/packages/util/lib/src/json_converter.dart/color_converter.dart b/packages/util/lib/src/json_converter.dart/color_converter.dart index d871fcc8..319682d2 100644 --- a/packages/util/lib/src/json_converter.dart/color_converter.dart +++ b/packages/util/lib/src/json_converter.dart/color_converter.dart @@ -11,6 +11,7 @@ class ColorConverter implements JsonConverter { const ColorConverter(); @override + // ignore: avoid_hardcoded_color Color fromJson(int json) => Color(json); @override diff --git a/packages/util/pubspec.yaml b/packages/util/pubspec.yaml index a0d27211..6011e106 100644 --- a/packages/util/pubspec.yaml +++ b/packages/util/pubspec.yaml @@ -16,5 +16,6 @@ dependencies: dev_dependencies: altive_lints: ^1.12.0 + custom_lint: ^0.6.7 flutter_test: sdk: flutter