diff --git a/.all-contributorsrc b/.all-contributorsrc index c8a039d3..5354342f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -263,7 +263,8 @@ "profile": "https://sharezone.net", "contributions": [ "infra", - "code" + "code", + "doc" ] }, { @@ -293,6 +294,33 @@ "contributions": [ "doc" ] + }, + { + "login": "fpinzn", + "name": "Francisco Pinz贸n", + "avatar_url": "https://avatars.githubusercontent.com/u/345207?v=4", + "profile": "https://github.com/fpinzn", + "contributions": [ + "doc" + ] + }, + { + "login": "th0rgall", + "name": "Thor Galle", + "avatar_url": "https://avatars.githubusercontent.com/u/11543641?v=4", + "profile": "http://thorgalle.me", + "contributions": [ + "doc" + ] + }, + { + "login": "Giuspepe", + "name": "Giuseppe Cianci", + "avatar_url": "https://avatars.githubusercontent.com/u/39117631?v=4", + "profile": "https://www.linkedin.com/in/giuseppe-cianci/", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 5, diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6836218f..8fba268b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,12 +44,9 @@ jobs: env: PUB_CREDENTIALS: ${{ secrets.PUB_CREDENTIALS }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - container: - image: google/dart:latest steps: - uses: actions/checkout@v1 - with: - fetch-depth: 0 + - uses: dart-lang/setup-dart@v1.3 - name: Install dependencies run: dart pub get diff --git a/CHANGELOG.md b/CHANGELOG.md index 44af99b3..2b4d07e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.4.0 + +- Upgraded minimum Dart version to 2.17.0 for better Flutter 3.0 compatibility + ## 2.3.1 - Update Flutter releases endpoint diff --git a/README.md b/README.md index c344856b..43a581e6 100644 --- a/README.md +++ b/README.md @@ -103,10 +103,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d <td align="center"><a href="https://github.com/rhalff"><img src="https://avatars.githubusercontent.com/u/274358?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Rob Halff</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=rhalff" title="Documentation">馃摉</a></td> </tr> <tr> - <td align="center"><a href="https://sharezone.net"><img src="https://avatars.githubusercontent.com/u/24459435?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Nils Reichardt</b></sub></a><br /><a href="#infra-nilsreichardt" title="Infrastructure (Hosting, Build-Tools, etc)">馃殗</a> <a href="https://github.com/fluttertools/fvm/commits?author=nilsreichardt" title="Code">馃捇</a></td> + <td align="center"><a href="https://sharezone.net"><img src="https://avatars.githubusercontent.com/u/24459435?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Nils Reichardt</b></sub></a><br /><a href="#infra-nilsreichardt" title="Infrastructure (Hosting, Build-Tools, etc)">馃殗</a> <a href="https://github.com/fluttertools/fvm/commits?author=nilsreichardt" title="Code">馃捇</a> <a href="https://github.com/fluttertools/fvm/commits?author=nilsreichardt" title="Documentation">馃摉</a></td> <td align="center"><a href="https://rcjuancarlosuwu.medium.com"><img src="https://avatars.githubusercontent.com/u/67658540?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Juan Carlos Ram贸n Condezo</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=rcjuancarlosuwu" title="Documentation">馃摉</a> <a href="#translation-rcjuancarlosuwu" title="Translation">馃實</a></td> <td align="center"><a href="https://github.com/zeshuaro"><img src="https://avatars.githubusercontent.com/u/12210067?v=4?s=50" width="50px;" alt=""/><br /><sub><b>zeshuaro</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=zeshuaro" title="Code">馃捇</a></td> <td align="center"><a href="https://github.com/ziehlke"><img src="https://avatars.githubusercontent.com/u/10786117?v=4?s=50" width="50px;" alt=""/><br /><sub><b>ziehlke</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=ziehlke" title="Documentation">馃摉</a></td> + <td align="center"><a href="https://github.com/fpinzn"><img src="https://avatars.githubusercontent.com/u/345207?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Francisco Pinz贸n</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=fpinzn" title="Documentation">馃摉</a></td> + </tr> + <tr> + <td align="center"><a href="http://thorgalle.me"><img src="https://avatars.githubusercontent.com/u/11543641?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Thor Galle</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=th0rgall" title="Documentation">馃摉</a></td> + <td align="center"><a href="https://www.linkedin.com/in/giuseppe-cianci/"><img src="https://avatars.githubusercontent.com/u/39117631?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Giuseppe Cianci</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=Giuspepe" title="Documentation">馃摉</a></td> </tr> </table> diff --git a/assets/android-studio-config.png b/assets/android-studio-config.png new file mode 100644 index 00000000..b174994b Binary files /dev/null and b/assets/android-studio-config.png differ diff --git a/lib/exceptions.dart b/lib/exceptions.dart index f1daa887..b0f0f951 100644 --- a/lib/exceptions.dart +++ b/lib/exceptions.dart @@ -1,6 +1,6 @@ /// Exception for internal FVM Errors class FvmInternalError implements Exception { - /// Message of erro + /// Message of error final String message; /// Constructor diff --git a/lib/src/version.dart b/lib/src/version.dart index ea3a9755..cfb4a066 100644 --- a/lib/src/version.dart +++ b/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '2.3.1'; +const packageVersion = '2.4.0'; diff --git a/pubspec.yaml b/pubspec.yaml index b4c3cab8..8cba195d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,34 +1,34 @@ name: fvm description: A simple cli to manage Flutter SDK versions per project. Support channels, releases, and local cache for fast switching between versions. -version: 2.3.1 +version: 2.4.0 homepage: https://github.com/leoafarias/fvm environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" executables: fvm: main dependencies: - args: ^2.1.0 + args: ^2.3.1 cli_notify: ^0.0.3 cli_util: ^0.3.5 console: ^4.1.0 - date_format: ^2.0.2 - io: ^1.0.0 - meta: ^1.3.0 - path: ^1.8.0 - process_run: ^0.12.1 - yaml: ^3.1.0 + date_format: ^2.0.6 + io: ^1.0.3 + meta: ^1.8.0 + path: ^1.8.2 + process_run: ^0.12.3+2 + yaml: ^3.1.1 dev_dependencies: - build_runner: ^2.1.1 - build_version: ^2.1.0 + build_runner: ^2.1.11 + build_version: ^2.1.1 effective_dart: ^1.3.2 - cli_pkg: ^1.7.0 + cli_pkg: ^2.1.4 - grinder: ^0.9.0 - test: ^1.17.11 - build_test: ^2.1.3 + grinder: ^0.9.2 + test: ^1.21.3 + build_test: ^2.1.5 test_cov: ^1.0.1 diff --git a/releases_linux.json b/releases_linux.json index a0dc48d9..1e0b3655 100644 --- a/releases_linux.json +++ b/releases_linux.json @@ -3,9 +3,29 @@ "current_release": { "beta": "f28e570c8cb12a004fae2d796d0d9cd46603bde9", "dev": "13a2fb10b838971ce211230f8ffdd094c14af02c", - "stable": "cd41fdd495f6944ecd3506c21e94c6567b073278" + "stable": "85684f9300908116a78138ea4c6036c35c9a1236" }, "releases": [ + { + "hash": "85684f9300908116a78138ea4c6036c35c9a1236", + "channel": "stable", + "version": "3.0.4", + "dart_sdk_version": "2.17.5", + "dart_sdk_arch": "x64", + "release_date": "2022-07-01T13:45:08.754031Z", + "archive": "stable/linux/flutter_linux_3.0.4-stable.tar.xz", + "sha256": "be1dd08cb18504ddf6d435044fd5e162a4a420b8c48fe66a0002eefe6c58fa0a" + }, + { + "hash": "676cefaaff197f27424942307668886253e1ec35", + "channel": "stable", + "version": "3.0.3", + "dart_sdk_version": "2.17.5", + "dart_sdk_arch": "x64", + "release_date": "2022-06-22T21:06:55.035195Z", + "archive": "stable/linux/flutter_linux_3.0.3-stable.tar.xz", + "sha256": "f3806787f3afc379769024f4f9b20c243811881a72bc9c6e62bfc2fd50676c48" + }, { "hash": "f28e570c8cb12a004fae2d796d0d9cd46603bde9", "channel": "beta", diff --git a/releases_macos.json b/releases_macos.json index c695c8c1..4f3d610b 100644 --- a/releases_macos.json +++ b/releases_macos.json @@ -3,9 +3,49 @@ "current_release": { "beta": "f28e570c8cb12a004fae2d796d0d9cd46603bde9", "dev": "13a2fb10b838971ce211230f8ffdd094c14af02c", - "stable": "cd41fdd495f6944ecd3506c21e94c6567b073278" + "stable": "85684f9300908116a78138ea4c6036c35c9a1236" }, "releases": [ + { + "hash": "85684f9300908116a78138ea4c6036c35c9a1236", + "channel": "stable", + "version": "3.0.4", + "dart_sdk_version": "2.17.5", + "dart_sdk_arch": "x64", + "release_date": "2022-07-01T13:35:29.055321Z", + "archive": "stable/macos/flutter_macos_3.0.4-stable.zip", + "sha256": "49176c7d27a20c41c06eb6247ecdaf19fc00b75a153f6705c2b80571fcb17019" + }, + { + "hash": "85684f9300908116a78138ea4c6036c35c9a1236", + "channel": "stable", + "version": "3.0.4", + "dart_sdk_version": "2.17.5", + "dart_sdk_arch": "arm64", + "release_date": "2022-07-01T13:33:10.334125Z", + "archive": "stable/macos/flutter_macos_arm64_3.0.4-stable.zip", + "sha256": "bc4f4a8ba5284f5f057d27274ee2c029a025bed0682b8a87645e9865dea4a884" + }, + { + "hash": "676cefaaff197f27424942307668886253e1ec35", + "channel": "stable", + "version": "3.0.3", + "dart_sdk_version": "2.17.5", + "dart_sdk_arch": "x64", + "release_date": "2022-06-22T20:56:43.015474Z", + "archive": "stable/macos/flutter_macos_3.0.3-stable.zip", + "sha256": "a81d9efcd0cd8a3bd9fa491c36870a9f732b401bc22f01cdb7d2262a7b2baf91" + }, + { + "hash": "676cefaaff197f27424942307668886253e1ec35", + "channel": "stable", + "version": "3.0.3", + "dart_sdk_version": "2.17.5", + "dart_sdk_arch": "arm64", + "release_date": "2022-06-22T20:33:34.298224Z", + "archive": "stable/macos/flutter_macos_arm64_3.0.3-stable.zip", + "sha256": "2f2f5da9f82bd29277655a0671bc5b523414471710529f9e3c784aa4d7cc8c8d" + }, { "hash": "f28e570c8cb12a004fae2d796d0d9cd46603bde9", "channel": "beta", diff --git a/releases_windows.json b/releases_windows.json index 49ef5d4e..ae887d9e 100644 --- a/releases_windows.json +++ b/releases_windows.json @@ -3,9 +3,29 @@ "current_release": { "beta": "f28e570c8cb12a004fae2d796d0d9cd46603bde9", "dev": "13a2fb10b838971ce211230f8ffdd094c14af02c", - "stable": "cd41fdd495f6944ecd3506c21e94c6567b073278" + "stable": "85684f9300908116a78138ea4c6036c35c9a1236" }, "releases": [ + { + "hash": "85684f9300908116a78138ea4c6036c35c9a1236", + "channel": "stable", + "version": "3.0.4", + "dart_sdk_version": "2.17.5", + "dart_sdk_arch": "x64", + "release_date": "2022-07-01T13:44:29.025401Z", + "archive": "stable/windows/flutter_windows_3.0.4-stable.zip", + "sha256": "c384bc31cf70466e20f9da3055bca3acada489f5a4148657ae8f7b31f936949c" + }, + { + "hash": "676cefaaff197f27424942307668886253e1ec35", + "channel": "stable", + "version": "3.0.3", + "dart_sdk_version": "2.17.5", + "dart_sdk_arch": "x64", + "release_date": "2022-06-22T20:36:01.289951Z", + "archive": "stable/windows/flutter_windows_3.0.3-stable.zip", + "sha256": "29dd29434fc6c49277a8edcf0600d09eef16fd24618124dd8905e22bef4c49c2" + }, { "hash": "f28e570c8cb12a004fae2d796d0d9cd46603bde9", "channel": "beta", diff --git a/website/docs/getting_started/configuration.mdx b/website/docs/getting_started/configuration.mdx index b00cebb0..b52193b5 100644 --- a/website/docs/getting_started/configuration.mdx +++ b/website/docs/getting_started/configuration.mdx @@ -54,6 +54,7 @@ You might have to restart your IDE and the Flutter debugger to make sure it uses You can add the version symlink for a dynamic switch. VS Code will always use the version selected within the project for all IDE tooling. Also, remove the flutter SDK from search to make things easier. Just create a folder inside the project called `.vscode` and then create a file called `settings.json` and add the following file: + ```json title=".vscode/settings.json" { "dart.flutterSdkPath": ".fvm/flutter_sdk", @@ -68,6 +69,9 @@ You can add the version symlink for a dynamic switch. VS Code will always use th } ``` +Simply execute `fvm use <desired version>` in the project root directory. This will now change the version. If you're still having issues, just click on the Flutter version text on status bar of vs code and it'll show you all the current SDKs installed in your computer.Eather select auto detect which will check `.vscode` dir inside your project and then change your flutter SDK depending on the fvm config or just manually select the flutter SDK from fvm and next time onwards use flutter use command to switch to different SDKs. + + #### Option 2 - View all SDKs (Manual switching) VSCode has the ability for you to switch between all cached Flutter SDKs using `Flutter: Change SDK`. @@ -79,11 +83,11 @@ Use command `fvm list` to show you the cache path to the versions. #### List all versions installed by FVM -You can see all the versions installed by FVM in VS Code by just providing path to `versions` directory: +You can see all the versions installed by FVM in VS Code by just providing path to `versions` directory. In the following example path for macOS, replace `$USER` with your username: ```json { - "dart.flutterSdkPaths": ["/Users/usr/fvm/versions"] + "dart.flutterSdkPaths": ["/Users/$USER/fvm/versions"] } ``` @@ -92,8 +96,8 @@ Alternatively, you can specify only selected versions. The following snippet wil ```json { "dart.flutterSdkPaths": [ - "/Users/usr/fvm/versions/stable", - "/Users/usr/fvm/versions/dev" + "/Users/$USER/fvm/versions/stable", + "/Users/$USER/fvm/versions/dev" ] } ``` @@ -127,3 +131,6 @@ If you want to ignore the Flutter SDK root directory within Android Studio you c </component> ... ``` + +If that doesn't work, go to Android Studio -> Preferences -> Editor -> File Types -> Ignored Files and Folders and add `flutter_sdk`: +![Android Studio Configuration](../../../assets/android-studio-config.png) \ No newline at end of file diff --git a/website/docs/getting_started/overview.md b/website/docs/getting_started/overview.md index 3f38a95e..ef086ed4 100644 --- a/website/docs/getting_started/overview.md +++ b/website/docs/getting_started/overview.md @@ -73,10 +73,15 @@ We follow these principles when building and adding new features to FVM. <td align="center"><a href="https://github.com/rhalff"><img src="https://avatars.githubusercontent.com/u/274358?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Rob Halff</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=rhalff" title="Documentation">馃摉</a></td> </tr> <tr> - <td align="center"><a href="https://sharezone.net"><img src="https://avatars.githubusercontent.com/u/24459435?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Nils Reichardt</b></sub></a><br /><a href="#infra-nilsreichardt" title="Infrastructure (Hosting, Build-Tools, etc)">馃殗</a> <a href="https://github.com/fluttertools/fvm/commits?author=nilsreichardt" title="Code">馃捇</a></td> + <td align="center"><a href="https://sharezone.net"><img src="https://avatars.githubusercontent.com/u/24459435?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Nils Reichardt</b></sub></a><br /><a href="#infra-nilsreichardt" title="Infrastructure (Hosting, Build-Tools, etc)">馃殗</a> <a href="https://github.com/fluttertools/fvm/commits?author=nilsreichardt" title="Code">馃捇</a> <a href="https://github.com/fluttertools/fvm/commits?author=nilsreichardt" title="Documentation">馃摉</a></td> <td align="center"><a href="https://rcjuancarlosuwu.medium.com"><img src="https://avatars.githubusercontent.com/u/67658540?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Juan Carlos Ram贸n Condezo</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=rcjuancarlosuwu" title="Documentation">馃摉</a> <a href="#translation-rcjuancarlosuwu" title="Translation">馃實</a></td> <td align="center"><a href="https://github.com/zeshuaro"><img src="https://avatars.githubusercontent.com/u/12210067?v=4?s=50" width="50px;" alt=""/><br /><sub><b>zeshuaro</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=zeshuaro" title="Code">馃捇</a></td> <td align="center"><a href="https://github.com/ziehlke"><img src="https://avatars.githubusercontent.com/u/10786117?v=4?s=50" width="50px;" alt=""/><br /><sub><b>ziehlke</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=ziehlke" title="Documentation">馃摉</a></td> + <td align="center"><a href="https://github.com/fpinzn"><img src="https://avatars.githubusercontent.com/u/345207?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Francisco Pinz贸n</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=fpinzn" title="Documentation">馃摉</a></td> + </tr> + <tr> + <td align="center"><a href="http://thorgalle.me"><img src="https://avatars.githubusercontent.com/u/11543641?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Thor Galle</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=th0rgall" title="Documentation">馃摉</a></td> + <td align="center"><a href="https://www.linkedin.com/in/giuseppe-cianci/"><img src="https://avatars.githubusercontent.com/u/39117631?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Giuseppe Cianci</b></sub></a><br /><a href="https://github.com/fluttertools/fvm/commits?author=Giuspepe" title="Documentation">馃摉</a></td> </tr> </table> diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 27434cb3..963f81b5 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -133,13 +133,13 @@ module.exports = { editLocalizedFiles: true, sidebarPath: require.resolve('./sidebars.js'), editUrl: - 'https://github.com/leoafarias/fvm/edit/master/website/', + 'https://github.com/fluttertools/fvm/edit/main/website/', }, blog: { showReadingTime: true, // Please change this to your repo. editUrl: - 'https://github.com/leoafarias/fvm/edit/master/doc/blog/', + 'https://github.com/fluttertools/fvm/edit/main/doc/blog/', }, theme: { customCss: require.resolve('./src/css/custom.css'),