chore(deps): upgrade to Flutter 3.16

Plus some dependences
canonical · Nov 30, 2023 · 04aa291 · 04aa291
1 parent a618368
commit 04aa291
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 60 deletions.
diff --git a/.github/workflows/analysis.yaml b/.github/workflows/analysis.yaml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.10.x'
+          flutter-version: '3.16.x'
       - run: flutter pub global activate melos
       - run: melos pub-get
       - run: melos run analyze
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.10.x'
+          flutter-version: '3.16.x'
       - run: flutter pub global activate melos
       - run: melos pub-get
       - run: melos run format
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.10.x'
+          flutter-version: '3.16.x'
       - run: flutter pub global activate melos
       - run: melos pub-get
       - run: melos exec --no-private -- \

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.10.x'
+        flutter-version: '3.16.x'
     - run: flutter pub global activate melos
     - run: sudo apt update
     - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip xvfb

diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.10.x'
+        flutter-version: '3.16.x'
     - run: flutter pub global activate melos
     - run: melos pub-get
     - run: flutter pub get # Bad state: Unable to generate package graph
@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.10.x'
+        flutter-version: '3.16.x'
     - run: flutter pub global activate melos
     - run: melos pub-get
     - run: melos run gen-l10n
@@ -42,7 +42,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.10.x'
+        flutter-version: '3.16.x'
     - run: flutter pub global activate melos
     - run: melos pub-get
     - run: flutter pub get # Bad state: Unable to generate package graph

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.10.x'
+        flutter-version: '3.16.x'
     - run: flutter pub global activate melos
     - run: sudo apt update
     - run: sudo apt install -y lcov
@@ -32,7 +32,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.10.x'
+        flutter-version: '3.16.x'
     - run: flutter pub global activate melos
     - run: melos pub-get
     - run: melos run test
@@ -43,7 +43,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.10.x'
+        flutter-version: '3.16.x'
     - run: flutter pub global activate melos
     - run: sudo apt update
     - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip xvfb

diff --git a/lib/preferences/preferences_dialog.dart b/lib/preferences/preferences_dialog.dart
@@ -69,7 +69,8 @@ class PreferencesDialog extends StatelessWidget {
                     clipBehavior: Clip.antiAlias,
                     child: YaruMasterDetailPage(
                       length: preferences.length,
-                      tileBuilder: (context, index, selected) => YaruMasterTile(
+                      tileBuilder: (context, index, selected, _) =>
+                          YaruMasterTile(
                         title: Text(preferences[index].title),
                       ),
                       pageBuilder: (context, index) => YaruDetailPage(

diff --git a/lib/terminal/terminal_actions.dart b/lib/terminal/terminal_actions.dart
@@ -6,7 +6,7 @@ import 'terminal_settings.dart';
 
 class ScrollToEndAction extends ScrollAction {
   @override
-  void invoke(covariant ScrollIntent intent) {
+  void invoke(covariant ScrollIntent intent, [BuildContext? context]) {
     final context = primaryFocus!.context!;
     var state = Scrollable.maybeOf(context);
     if (state == null) {

diff --git a/packages/accel_key/pubspec.yaml b/packages/accel_key/pubspec.yaml
@@ -2,15 +2,15 @@ name: accel_key
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.0.0'
 
 dependencies:
   collection: ^1.16.0
   ffi: ^2.0.1
   flutter:
     sdk: flutter
-  ubuntu_localizations: ^0.1.6
+  ubuntu_localizations: ^0.3.4
 
 dev_dependencies:
   ffigen: ^7.1.0

diff --git a/packages/command_store/pubspec.yaml b/packages/command_store/pubspec.yaml
@@ -2,8 +2,8 @@ name: command_store
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.0.0'
 
 dependencies:
   accel_key:
@@ -18,4 +18,4 @@ dev_dependencies:
   flutter_lints: ^2.0.0
   flutter_test:
     sdk: flutter
-  mockito: 5.4.0
+  mockito: ^5.4.3
diff --git a/packages/context_menu/pubspec.yaml b/packages/context_menu/pubspec.yaml
@@ -3,8 +3,8 @@ description: Context menu.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/flutter_jsettings/example/pubspec.yaml b/packages/flutter_jsettings/example/pubspec.yaml
@@ -2,7 +2,7 @@ name: jsettings_example
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   collection: ^1.16.0
@@ -14,7 +14,7 @@ dependencies:
   provider: ^6.0.4
   ubuntu_service: ^0.2.0
   xdg_directories: ^0.2.0+2
-  yaru: ^0.9.0
+  yaru: ^1.2.0
 
 dev_dependencies:
   flutter_lints: ^2.0.0

diff --git a/packages/flutter_jsettings/pubspec.yaml b/packages/flutter_jsettings/pubspec.yaml
@@ -6,7 +6,7 @@ issue_tracker: https://github.com/ubuntu-flutter-community/jsettings.dart/issues
 version: 0.1.0
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
   flutter: '>=3.0.0'
 
 dependencies:
@@ -19,4 +19,4 @@ dev_dependencies:
   flutter_lints: ^2.0.0
   flutter_test:
     sdk: flutter
-  mockito: ^5.3.2
+  mockito: ^5.4.3
diff --git a/packages/jsettings/pubspec.yaml b/packages/jsettings/pubspec.yaml
@@ -6,13 +6,13 @@ issue_tracker: https://github.com/jpnurmi/jsettings.dart/issues
 version: 0.1.1
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   collection: ^1.16.0
   path: ^1.8.0
 
 dev_dependencies:
   lints: ^2.0.0
-  mockito: ^5.3.2
+  mockito: ^5.4.3
   test: ^1.16.0
diff --git a/packages/lxd/pubspec.yaml b/packages/lxd/pubspec.yaml
@@ -7,7 +7,7 @@ description: |
 homepage: https://github.com/canonical/lxd.dart
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 platforms:
   linux:
@@ -23,5 +23,5 @@ dev_dependencies:
   freezed: ^2.3.1
   json_serializable: ^6.2.0
   lints: ^2.0.0
-  mockito: 5.4.0
+  mockito: ^5.4.3
   test: ^1.16.8
diff --git a/packages/lxd_service/pubspec.yaml b/packages/lxd_service/pubspec.yaml
@@ -2,7 +2,7 @@ name: lxd_service
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   collection: ^1.16.0
@@ -24,5 +24,5 @@ dev_dependencies:
   freezed: ^2.3.1
   json_serializable: ^6.2.0
   lints: ^2.0.0
-  mockito: 5.4.0
+  mockito: ^5.4.3
   test: ^1.16.0
diff --git a/packages/lxd_test/pubspec.yaml b/packages/lxd_test/pubspec.yaml
@@ -2,7 +2,7 @@ name: lxd_test
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   lxd:

diff --git a/packages/lxd_x/pubspec.yaml b/packages/lxd_x/pubspec.yaml
@@ -2,7 +2,7 @@ name: lxd_x
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   collection: ^1.16.0

diff --git a/packages/movable_tabs/pubspec.yaml b/packages/movable_tabs/pubspec.yaml
@@ -3,13 +3,13 @@ description: Movable tabs.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
-  yaru_icons: ^1.0.0
+  yaru_icons: ^2.2.2
 
 dev_dependencies:
   flutter_lints: ^2.0.0

diff --git a/packages/nested_split_view/example/pubspec.yaml b/packages/nested_split_view/example/pubspec.yaml
@@ -1,8 +1,8 @@
 name: nested_split_view_example
-publish_to: 'none' 
+publish_to: 'none'
 
 environment:
-  sdk: '>=2.18.1 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/nested_split_view/pubspec.yaml b/packages/nested_split_view/pubspec.yaml
@@ -3,8 +3,8 @@ description: Nested SplitView.
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
-  flutter: ">=3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.0.0'
 
 dependencies:
   collection: ^1.16.0

diff --git a/packages/os_logo/pubspec.yaml b/packages/os_logo/pubspec.yaml
@@ -3,8 +3,8 @@ description: OS logo
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.0.0'
 
 dependencies:
   flutter:
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_lints: ^2.0.0
   flutter_test:
     sdk: flutter
-  mockito: 5.4.0
+  mockito: ^5.4.3
 
 flutter:
   assets:

diff --git a/packages/osarch/pubspec.yaml b/packages/osarch/pubspec.yaml
@@ -2,13 +2,13 @@ name: osarch
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   collection: ^1.16.0
   meta: ^1.7.0
   stdlibc: ^0.1.0
 
 dev_dependencies:
-  mockito: 5.4.0
+  mockito: ^5.4.3
   test: ^1.21.1
diff --git a/packages/petname/pubspec.yaml b/packages/petname/pubspec.yaml
@@ -7,7 +7,7 @@ homepage: https://github.com/dustinkirkland/petname
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   meta: ^1.7.0

diff --git a/packages/terminal_view/pubspec.yaml b/packages/terminal_view/pubspec.yaml
@@ -2,8 +2,8 @@ name: terminal_view
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.0.0'
 
 dependencies:
   flutter:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,8 +3,8 @@ description: Workshops
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.0.0'
 
 dependencies:
   accel_key:
@@ -63,21 +63,17 @@ dependencies:
   substring_highlight: ^1.0.33
   terminal_view:
     path: packages/terminal_view
-  ubuntu_localizations: ^0.1.6
+  ubuntu_localizations: ^0.3.4
   ubuntu_logger: ^0.0.2
   ubuntu_service: ^0.2.0
-  ubuntu_widgets:
-    git:
-      url: https://github.com/canonical/ubuntu-flutter-plugins.git
-      path: packages/ubuntu_widgets
-      ref: 2549b38607f8c634404f478f719a6ab6a5344605
+  ubuntu_widgets: ^0.3.0
   window_manager: ^0.3.0
   wizard_router: ^0.9.0
   xdg_directories: ^0.2.0+2
   yaml: ^3.1.1
-  yaru: ^0.5.0
-  yaru_icons: ^1.0.0
-  yaru_widgets: ^2.0.0
+  yaru: ^1.2.0
+  yaru_icons: ^2.2.2
+  yaru_widgets: ^3.3.1
 
 dev_dependencies:
   build_runner: ^2.1.11
@@ -87,7 +83,7 @@ dev_dependencies:
   freezed: ^2.3.1
   json_serializable: ^6.2.0
   melos: ^3.0.1
-  mockito: 5.4.0
+  mockito: ^5.4.3
 
 flutter:
   generate: true