From e00f5c4a26bf51a3735a684781d215e760bb61a7 Mon Sep 17 00:00:00 2001 From: Ryunosuke Muramatsu Date: Sat, 14 Oct 2023 22:10:03 +0900 Subject: [PATCH] remove FVM (#8) --- .fvm/fvm_config.json | 4 ---- .github/actions/setup_flutter/action.yml | 20 -------------------- .github/workflows/code-check.yml | 21 ++++++++------------- .gitignore | 3 --- .vscode/settings.json | 10 ---------- melos.yaml | 3 +-- 6 files changed, 9 insertions(+), 52 deletions(-) delete mode 100644 .fvm/fvm_config.json delete mode 100644 .github/actions/setup_flutter/action.yml diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index 9acb749..0000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.13.6", - "flavors": {} -} \ No newline at end of file diff --git a/.github/actions/setup_flutter/action.yml b/.github/actions/setup_flutter/action.yml deleted file mode 100644 index b6c9bc9..0000000 --- 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@v1 - - - 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/code-check.yml b/.github/workflows/code-check.yml index ba2b007..b9daeed 100644 --- a/.github/workflows/code-check.yml +++ b/.github/workflows/code-check.yml @@ -37,7 +37,6 @@ jobs: - '**/analysis_options.yaml' - '**/melos.yaml' - '**/pubspec.yaml' - - 'fvm_config.json' analyze: needs: check @@ -47,12 +46,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Flutter - id: setup-flutter - uses: ./.github/actions/setup_flutter - - - name: Prepare Melos - run: echo "MELOS_SDK_PATH=${{ steps.setup-flutter.outputs.flutter-path }}" >> "$GITHUB_ENV" + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + cache: true - name: Install Melos uses: bluefireteam/melos-action@v2 @@ -71,12 +68,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Flutter - id: setup-flutter - uses: ./.github/actions/setup_flutter - - - name: Prepare Melos - run: echo "MELOS_SDK_PATH=${{ steps.setup-flutter.outputs.flutter-path }}" >> "$GITHUB_ENV" + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + cache: true - name: Install Melos uses: bluefireteam/melos-action@v2 diff --git a/.gitignore b/.gitignore index b61d8ca..908b165 100644 --- a/.gitignore +++ b/.gitignore @@ -141,9 +141,6 @@ coverage/ # Fastlane related **/fastlane/report.xml -# FVM related -**/.fvm/flutter_sdk - # Bundler related **/vendor/bundle diff --git a/.vscode/settings.json b/.vscode/settings.json index bce36ac..c0eb075 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -35,7 +35,6 @@ "*.gen.dart", "*.lock", "*.xcconfig", - "**/fvm", "**/.pub-cache", ".git/objects", ".vscode", @@ -90,10 +89,6 @@ }, // Regenerate the Localization file every time an arb file is saved. "dart.flutterGenerateLocalizationsOnSave": "all", - // Specify the path to the Flutter SDK you are using. - "dart.flutterSdkPath": ".fvm/flutter_sdk", - // Specify the path to the Dart SDK you are using. - "dart.sdkPath": ".fvm/flutter_sdk/bin/cache/dart-sdk", // Mark external packages as debuggable and enable stepping into them during debugging if `true`. "dart.debugExternalPackageLibraries": false, // Mark Dart SDK libraries as debuggable and enable stepping into them during debugging if `true`. @@ -119,10 +114,6 @@ "readme.*": "authors, backers.md, changelog*, citation*, code_of_conduct.md, codeowners, contributing.md, contributors, copying, credits, governance.md, history.md, license*, maintainers, readme*, security.md, sponsors.md", "*.dart": "$(capture).g.dart, $(capture).freezed.dart, $(capture).mocks.dart" }, - // Exclude specified files from monitoring. - "files.watcherExclude": { - "**/.fvm": true - }, // Fetch commits automatically from the default remote of the current Git repository if `true`. // When set to `all`, fetch from all remotes. "git.autofetch": true, @@ -130,7 +121,6 @@ "git.enableSmartCommit": true, // Exclude generated files from the search targets. "search.exclude": { - "**/.fvm": true, "**/*.freezed.dart": true, "**/*.g.dart": true } diff --git a/melos.yaml b/melos.yaml index 44eadd3..d845fa1 100644 --- a/melos.yaml +++ b/melos.yaml @@ -1,6 +1,5 @@ name: flutterfire_adapter repository: https://github.com/altive/flutterfire_adapter -sdkPath: .fvm/flutter_sdk packages: - packages/* @@ -72,4 +71,4 @@ scripts: flutter test --coverage description: Run flutter test for CI. packageFilters: - dirExists: test \ No newline at end of file + dirExists: test