diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e6d4ad127..ac3f39a20 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 7df89e31b..38fd0c349 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -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/ diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 000000000..5439e1df5 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +flutter 3.13.7-stable diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 824d04b8b..29c819e1f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. diff --git a/pubspec.yaml b/pubspec.yaml index 81bd4d0f6..8ea4ff4f7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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.7 dependencies: appstream: ^0.2.8 @@ -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 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 540fe665d..24c70ee6f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -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: |