Merge branch 'main' into remove-version-from-fvmrc

leoafarias · Feb 28, 2024 · 6245985 · 6245985
2 parents fcf5ea9 + da62390
commit 6245985
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 53 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,6 @@ on:
       - "docs/**"
       - "README.md"
       - "CHANGELOG.md"
-      - ".github/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -44,15 +43,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run DCM
-        uses: CQLabs/dcm-action@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          ci_key: oss
-          email: oss
-          folders: .
-          fatal_style: true
-          fatal_performance: true
-          fatal_warnings: true
+        run: dcm analyze lib
 
       - name: Install lcov
         run: sudo apt-get install lcov
@@ -87,13 +78,4 @@ jobs:
           sdk-version: ${{ github.event.inputs.sdk-version }}
 
       - name: Tests
-        uses: ./.github/actions/test
-
-  linkinator:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: JustinBeckwith/linkinator-action@v1
-        with:
-          concurrency: 3
-          markdown: true
+        uses: ./.github/actions/test
diff --git a/docs/pages/documentation/getting-started/configuration.mdx b/docs/pages/documentation/getting-started/configuration.mdx
@@ -4,6 +4,7 @@ title: Configuration
 ---
 
 import { Callout } from "nextra/components";
+import { FileTree } from "nextra/components";
 
 # Configuration
 
@@ -30,12 +31,12 @@ This contains version linked to the project. This file is automatically created
 }
 ```
 
+- `flutter`: The version of the Flutter SDK to be used, falling back to the flutter value if not explicitly set.
 - `cachePath`: Defines the path to the project's cache directory.
 - `useGitCache`: (default: true) Indicates whether the Git cache is used for dependencies.
 - `gitCachePath`: Sets the path to the Git cache directory, applicable if useGitCache is true.
 - `flutterUrl`: Specifies the URL to the Flutter SDK repository.
 - `priviledgedAccess`:(default: true) Determines if configurations requiring elevated permissions are enabled.
-- `flutterSdkVersion`: The version of the Flutter SDK to be used, falling back to the flutter value if not explicitly set.
 - `flavors`: A map defining custom project flavors for different configurations.
 - `updateVscodeSettings`: (default: true) Flags whether to auto-update VS Code settings on configuration changes.
 - `updateGitIgnore`: (default:true) Indicates whether to auto-update the .gitignore file based on project configurations.
@@ -45,8 +46,21 @@ This contains version linked to the project. This file is automatically created
 
 Inside the directory you will find the following files and directories:
 
+<FileTree>
+  <FileTree.Folder name=".fvm" defaultOpen>
+    <FileTree.Folder name="versions" defaultOpen>
+      <FileTree.File name="stable" />
+      <FileTree.File name="beta" />
+      <FileTree.File name="3.19.1" />
+    </FileTree.Folder>
+    <FileTree.Folder name="flutter_sdk" />
+    <FileTree.File name="release" />
+    <FileTree.File name="version" />
+  </FileTree.Folder>
+</FileTree>
+
 - **flutter_sdk** - Symlink to the Flutter SDK version linked to the project.
-- **versions/[version]** - Directory containing the Flutter SDK versions. This is similar to flutter_sdk, but is used for better VsCode compatibility.
+- **versions** - Directory containing the Flutter SDK versions. This is similar to flutter_sdk, but is used for better VsCode compatibility.
 - **fvm_config.json** - (deprecated) This is a legacy configuration file.
 - **release** - (internal use only) File containing the release version of FVM.
 - **version** - (internal use only) File containing the version of FVM.

diff --git a/lib/src/utils/deprecation_util.dart b/lib/src/utils/deprecation_util.dart
@@ -42,37 +42,6 @@ void deprecationWorkflow() {
   }
 }
 
-// Future<void> _migrateVersionSyntax() async {
-//   final versions = await CacheService.fromContext.getAllVersions();
-
-//   final oldVersions = versions.where((version) {
-//     final versionName = version.name;
-//     final versionParts = versionName.split('@');
-//     if (versionParts.length > 1) {
-//       return true;
-//     }
-//     return false;
-//   });
-
-//   if (oldVersions.isEmpty) {
-//     return;
-//   }
-
-//   logger.warn('You have a deprecated version / channel syntax. ');
-
-//   for (var element in oldVersions) {
-//     logger
-//       ..info(element.name)
-//       ..spacer
-//       ..info('Run: fvm remove ${element.name}}')
-//       ..spacer
-//       ..info('Then run: fvm install ${element.name.split('@').first}')
-//       ..info(
-//         'if you need to force install a channel run: fvm install ${element.name.split('@').first} --channel beta',
-//       );
-//   }
-// }
-
 // TODO: Removed on future version of the app
 // Deprecated on 3.0.0
 void _warnDeprecatedEnvVars() {