Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: bump yaru and flutter versions #1465

Merged
merged 5 commits into from
Oct 23, 2023
Merged

feat: bump yaru and flutter versions #1465

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca76166
chore: bump flutter and yaru versions
d-loose Oct 19, 2023
b5636fb
feat(ci): use asdf to manage flutter version
d-loose Oct 19, 2023
d6ba997
docs: update flutter installation instructions
d-loose Oct 19, 2023
f1634a9
chore(snap): bump flutter version
d-loose Oct 19, 2023
392ab4c
feat: fix flutter version in pubspec
d-loose Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 10 additions & 33 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,13 @@ on:
pull_request:
workflow_dispatch:

env:
FLUTTER_VERSION: '3.10.x'

jobs:
analyze:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
flutter-version: ${{env.FLUTTER_VERSION}}
- uses: asdf-vm/actions/install@v2
- run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
- run: flutter pub global activate melos
- run: melos pub get
- run: melos analyze
Expand All @@ -29,12 +22,8 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
flutter-version: ${{env.FLUTTER_VERSION}}
- uses: asdf-vm/actions/install@v2
- run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
- run: flutter pub global activate melos
- run: melos pub get
- run: melos format
Expand All @@ -43,12 +32,8 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
flutter-version: ${{env.FLUTTER_VERSION}}
- uses: asdf-vm/actions/install@v2
- run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
- run: flutter pub global activate melos
- run: melos pub get
- run: melos generate
Expand All @@ -69,12 +54,8 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
flutter-version: ${{env.FLUTTER_VERSION}}
- uses: asdf-vm/actions/install@v2
- run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
- run: flutter pub global activate melos
- run: melos pub get
- run: melos gen-l10n
Expand All @@ -95,12 +76,8 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
flutter-version: ${{env.FLUTTER_VERSION}}
- uses: asdf-vm/actions/install@v2
- run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
- run: sudo apt update && sudo apt install -y lcov
- run: flutter pub global activate melos
- run: melos pub get
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/integration-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
flutter-version: '3.10.6'
- uses: asdf-vm/actions/install@v2
- run: sudo apt update
- run: sudo apt install -y clang cmake libblkid-dev libglib2.0-dev libgtk-3-dev liblzma-dev network-manager ninja-build packagekit pkg-config polkitd xvfb
- run: sudo cp integration_test/assets/snapd-ci.pkla /var/lib/polkit-1/localauthority/50-local.d/
Expand Down
1 change: 1 addition & 0 deletions .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
flutter 3.13.7-stable
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Translations are managed using [Weblate](https://hosted.weblate.org/projects/ubu

### Required dependencies

[Install Flutter](https://flutter.dev/docs/get-started/install/linux) (Note: Currently version 3.10.6 is required. You can use tools like [fvm](https://fvm.app/) and [asdf](https://asdf-vm.com/) to easily manage Flutter versions).
[Install Flutter](https://flutter.dev/docs/get-started/install/linux) - the currently used version is specified in `.tool-versions`. If you're using [asdf](https://asdf-vm.com/) to manage your Flutter SDK, you can simply run `asdf install` to install the required version.

Even though this repo currently consists of only a single package we provide a [Melos](https://docs.page/invertase/melos) configuration to make it straightforward to execute common tasks.

Expand Down
12 changes: 5 additions & 7 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ version: 1.0.0
publish_to: 'none'

environment:
# fix Flutter version to 3.10.6
# (exact version bug: https://github.com/dart-lang/sdk/issues/52672)
sdk: '>=3.0.6 <3.0.7'
flutter: '>=3.10.6 <3.10.7'
sdk: '>=3.1.0 <4.0.0'
flutter: '>=3.13.0'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as in firmware-updater about fixing to a specific version rather than a range

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed it to 3.13.7 here as well


dependencies:
appstream: ^0.2.8
Expand Down Expand Up @@ -50,9 +48,9 @@ dependencies:
ubuntu_widgets: ^0.2.0
url_launcher: ^6.1.12
xdg_directories: ^1.0.0
yaru: ^0.9.0
yaru_icons: ^1.0.4
yaru_widgets: ^2.6.0
yaru: ^1.1.0
yaru_icons: ^2.2.0
yaru_widgets: ^3.2.0
yaru_test: ^0.1.4
clock: ^1.1.1

Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: git
parts:
flutter-git:
source: https://github.com/flutter/flutter.git
source-tag: 3.10.6
source-tag: 3.13.7
source-depth: 1
plugin: nil
override-build: |
Expand Down