Skip to content

Commit

Permalink
chore!: Bump Flutter to 3.24.3 (#435)
Browse files Browse the repository at this point in the history
This also moves over to the fvm workflow and fixes formatting.
  • Loading branch information
spydon authored Sep 18, 2024
2 parents 72267fb + defffeb commit 9ebced7
Show file tree
Hide file tree
Showing 166 changed files with 1,043 additions and 597 deletions.
3 changes: 3 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.24.3"
}
18 changes: 9 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: melos analyze

build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: sudo apt update
- run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip xvfb
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: sudo apt update
- run: sudo apt install -y lcov
Expand All @@ -47,15 +47,15 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: melos run format

integration:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: sudo apt update
- run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip xvfb
Expand All @@ -69,7 +69,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: melos generate
- run: ./.github/scripts/check-outdated-files.sh
Expand All @@ -88,7 +88,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: melos gen-l10n
- run: ./.github/scripts/check-outdated-files.sh
Expand All @@ -107,14 +107,14 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: melos exec --no-private -- flutter pub publish --dry-run

test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/install@v3
- uses: Atsumi3/actions[email protected]
- uses: bluefireteam/melos-action@v3
- run: melos test
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ coverage/
**/pubspec_overrides.yaml

# FVM Version Cache
.fvm/
.fvm/
**/.fvm
1 change: 0 additions & 1 deletion .tool-versions

This file was deleted.

35 changes: 18 additions & 17 deletions melos.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: ubuntu_flutter_plugins
sdkPath: .fvm/flutter_sdk

packages:
- packages/**
Expand All @@ -7,14 +8,14 @@ command:
bootstrap:
environment:
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.22.1"
flutter: ">=3.24.3"

dependencies:
collection: ^1.17.0
flutter_svg: ^2.0.9
collection: ^1.18.0
flutter_svg: ^2.0.10+1
intl: ^0.19.0
meta: ^1.11.0
path: ^1.8.3
meta: ^1.15.0
path: ^1.9.0

dev_dependencies:
mockito: 5.4.4
Expand All @@ -23,17 +24,17 @@ scripts:
# analyze all packages
analyze: >
melos exec -c 1 -- \
flutter analyze .
fvm flutter analyze .
# build examples in all packages
build: >
melos exec -c 1 --fail-fast --flutter --scope="*example*" --dir-exists=linux -- \
flutter build linux
fvm flutter build linux
# collect coverage information for all packages
coverage: >
melos exec -c 1 --fail-fast --dir-exists=test -- \
flutter test --coverage && melos run coverage:cleanup
fvm flutter test --coverage && melos run coverage:cleanup
# cleanup generated files from coverage
coverage:cleanup: >
Expand All @@ -47,37 +48,37 @@ scripts:
! -name '*.freezed.dart' \
! -path '*/l10n/*' \
! -path "*/.*/*" \
| xargs dart format --set-exit-if-changed
| xargs fvm dart format --set-exit-if-changed
# run build_runner to generate code in all packages
generate: >
melos exec -c 1 --fail-fast --depends-on=build_runner -- \
dart run build_runner build --delete-conflicting-outputs
fvm dart run build_runner build --delete-conflicting-outputs
# run gen-l10n to generate localizations in all packages
gen-l10n:
melos exec -c 1 --fail-fast --depends-on=flutter_localizations -- \
flutter gen-l10n
fvm flutter gen-l10n

# run integration tests in all packages
integration_test: >
melos exec -c 1 --dir-exists=integration_test -- \
flutter test integration_test
fvm flutter test integration_test
# runs "flutter pub <arg(s)>" in all packages
pub: melos exec -c 1 -- flutter pub "$@"
pub: melos exec -c 1 -- fvm flutter pub "$@"

# run tests in all packages
test: >
melos exec -c 1 --dir-exists=test -- \
flutter test
fvm flutter test
# run pub upgrade in all packages
upgrade: melos exec flutter pub upgrade
upgrade: melos exec fvm flutter pub upgrade

# update all goldens files
update-goldens:
run: melos exec -- flutter test --update-goldens
run: melos exec -- fvm flutter test --update-goldens
packageFilters:
dirExists: test
description: Re-generate all golden test files
description: Re-generate all golden test files
1 change: 1 addition & 0 deletions packages/platform_linux/.fvmrc
1 change: 1 addition & 0 deletions packages/platform_linux/.pubignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.fvmrc
Loading

0 comments on commit 9ebced7

Please sign in to comment.