From 8d37aeffb95e5bd9dd830591c60509ec640fb89f Mon Sep 17 00:00:00 2001 From: nilsreichardt Date: Sun, 3 Mar 2024 11:24:29 +0100 Subject: [PATCH 1/2] Migrate to FVM 3 --- .fvm/fvm_config.json | 4 ---- .fvmrc | 6 ++++++ .gitignore | 6 +++--- .vscode/settings.json | 22 +++++++--------------- 4 files changed, 16 insertions(+), 22 deletions(-) delete mode 100644 .fvm/fvm_config.json create mode 100644 .fvmrc diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index 7691f7539..000000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.19.2", - "flavors": {} -} \ No newline at end of file diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 000000000..be5311cde --- /dev/null +++ b/.fvmrc @@ -0,0 +1,6 @@ +{ + "flutter": "3.19.2", + "updateVscodeSettings": false, + "updateGitIgnore": false, + "runPubGetOnSdkChanges": false +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7f5508ac8..6e270607f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,8 +12,8 @@ coverage/ !.vscode/launch.json !.vscode/settings.json -# FVM will create a relative symlink in your project from .fvm/flutter_sdk to +# FVM will create a relative symlink in your project from .fvm/versions/ to # the cache of the selected version. We should add this to our .gitignore. # -# Source: https://fvm.app/docs/getting_started/configuration#project -.fvm/flutter_sdk +# Source: https://fvm.app/documentation/getting-started/configuration +.fvm/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 47270daee..35e6e6e04 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,17 +1,9 @@ { - // Set the path of the Flutter SDK to the path of the FVM Flutter version. - // - // VS Code will always use the version selected within the project for all - // IDE tooling. - // - // Source: https://fvm.app/docs/getting_started/configuration#option-1---automatic-switching-recommended - "dart.flutterSdkPath": ".fvm/flutter_sdk", - "search.exclude": { - // Remove .fvm files from search - "**/.fvm": true - }, - "files.watcherExclude": { - // Remove .fvm files from file watching - "**/.fvm": true - } + "dart.flutterSdkPath": ".fvm/versions/3.19.2", + "search.exclude": { + "**/.fvm": true + }, + "files.watcherExclude": { + "**/.fvm": true + } } \ No newline at end of file From 867fe1ef61fbe764cbb2bbba316f633de70850da Mon Sep 17 00:00:00 2001 From: nilsreichardt Date: Sun, 3 Mar 2024 11:24:50 +0100 Subject: [PATCH 2/2] Use Flutter FVM Config Action 2.0 --- .github/workflows/alpha.yml | 8 ++++---- .github/workflows/beta.yml | 8 ++++---- .github/workflows/cli_ci.yml | 4 ++-- .github/workflows/integration_tests_app_ci.yml | 8 ++++---- .github/workflows/licence.yml | 2 +- .github/workflows/safe_app_ci.yml | 8 ++++---- .github/workflows/safe_website_ci.yml | 2 +- .github/workflows/stable.yml | 8 ++++---- .github/workflows/unsafe_app_ci.yml | 2 +- .github/workflows/unsafe_website_ci.yml | 2 +- .github/workflows/website_cd.yml | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 085a6d0fb..9f846c821 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -75,7 +75,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -111,7 +111,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -211,7 +211,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -270,7 +270,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 51c2ff7cb..62ff341c3 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -73,7 +73,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -121,7 +121,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -175,7 +175,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -220,7 +220,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/cli_ci.yml b/.github/workflows/cli_ci.yml index 15d6ab825..024d19df1 100644 --- a/.github/workflows/cli_ci.yml +++ b/.github/workflows/cli_ci.yml @@ -85,7 +85,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -116,7 +116,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/integration_tests_app_ci.yml b/.github/workflows/integration_tests_app_ci.yml index c44726c7d..32c6edb48 100644 --- a/.github/workflows/integration_tests_app_ci.yml +++ b/.github/workflows/integration_tests_app_ci.yml @@ -93,7 +93,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@main with: @@ -183,7 +183,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -235,7 +235,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -310,7 +310,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/licence.yml b/.github/workflows/licence.yml index 47409f799..4b19b41b9 100644 --- a/.github/workflows/licence.yml +++ b/.github/workflows/licence.yml @@ -43,7 +43,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/safe_app_ci.yml b/.github/workflows/safe_app_ci.yml index 634c4cc7e..bc1cb0743 100644 --- a/.github/workflows/safe_app_ci.yml +++ b/.github/workflows/safe_app_ci.yml @@ -102,7 +102,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -131,7 +131,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -166,7 +166,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -209,7 +209,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/safe_website_ci.yml b/.github/workflows/safe_website_ci.yml index 98607e432..aae25f163 100644 --- a/.github/workflows/safe_website_ci.yml +++ b/.github/workflows/safe_website_ci.yml @@ -101,7 +101,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index 9ea557bb3..499efe394 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -73,7 +73,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -122,7 +122,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -177,7 +177,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: @@ -222,7 +222,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/unsafe_app_ci.yml b/.github/workflows/unsafe_app_ci.yml index 467150b09..8470de697 100644 --- a/.github/workflows/unsafe_app_ci.yml +++ b/.github/workflows/unsafe_app_ci.yml @@ -148,7 +148,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/unsafe_website_ci.yml b/.github/workflows/unsafe_website_ci.yml index 21999d862..8ef1b1391 100644 --- a/.github/workflows/unsafe_website_ci.yml +++ b/.github/workflows/unsafe_website_ci.yml @@ -147,7 +147,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: diff --git a/.github/workflows/website_cd.yml b/.github/workflows/website_cd.yml index a0b651f7a..b837e54b9 100644 --- a/.github/workflows/website_cd.yml +++ b/.github/workflows/website_cd.yml @@ -79,7 +79,7 @@ jobs: - name: Set Flutter version from FVM config file to environment variables id: fvm-config-action - uses: kuhnroyal/flutter-fvm-config-action@6ffa30473b346f7d7c63cf9e03e6a886f940a72b + uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf with: