Merge branch 'main' into track-active-changes from upstream.

ubuntu · Dec 24, 2023 · 4d842d2 · 4d842d2
2 parents 51b706a + b8df931
commit 4d842d2
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 33 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-flutter 3.16.0-stable
+flutter 3.16.4-stable
diff --git a/melos.yaml b/melos.yaml
@@ -7,7 +7,7 @@ command:
   bootstrap:
     environment:
       sdk: '>=3.1.0 <4.0.0'
-      flutter: 3.13.9
+      flutter: 3.16.4
 
     dev_dependencies:
       ubuntu_lints: ^0.3.0

diff --git a/packages/app_center/lib/src/search/search_page.dart b/packages/app_center/lib/src/search/search_page.dart
@@ -48,31 +48,29 @@ class SearchPage extends StatelessWidget {
                 Row(children: [
                   Text(l10n.searchPageSortByLabel),
                   const SizedBox(width: 8),
-                  Expanded(
-                    child: Consumer(builder: (context, ref, child) {
-                      final sortOrder = ref.watch(snapSortOrderProvider);
-                      return MenuButtonBuilder<SnapSortOrder?>(
-                        values: const [
-                          null,
-                          SnapSortOrder.alphabeticalAsc,
-                          SnapSortOrder.alphabeticalDesc,
-                          SnapSortOrder.downloadSizeAsc,
-                          SnapSortOrder.downloadSizeDesc,
-                        ],
-                        itemBuilder: (context, sortOrder, child) => Text(
-                          sortOrder?.localize(l10n) ??
-                              l10n.snapSortOrderRelevance,
-                        ),
-                        onSelected: (value) => ref
-                            .read(snapSortOrderProvider.notifier)
-                            .state = value,
-                        child: Text(
-                          sortOrder?.localize(l10n) ??
-                              l10n.snapSortOrderRelevance,
-                        ),
-                      );
-                    }),
-                  ),
+                  Consumer(builder: (context, ref, child) {
+                    final sortOrder = ref.watch(snapSortOrderProvider);
+                    return MenuButtonBuilder<SnapSortOrder?>(
+                      values: const [
+                        null,
+                        SnapSortOrder.alphabeticalAsc,
+                        SnapSortOrder.alphabeticalDesc,
+                        SnapSortOrder.downloadSizeAsc,
+                        SnapSortOrder.downloadSizeDesc,
+                      ],
+                      itemBuilder: (context, sortOrder, child) => Text(
+                        sortOrder?.localize(l10n) ??
+                            l10n.snapSortOrderRelevance,
+                      ),
+                      onSelected: (value) => ref
+                          .read(snapSortOrderProvider.notifier)
+                          .state = value,
+                      child: Text(
+                        sortOrder?.localize(l10n) ??
+                            l10n.snapSortOrderRelevance,
+                      ),
+                    );
+                  }),
                   if (query != null) ...[
                     const SizedBox(width: 24),
                     Text(l10n.searchPageFilterByLabel),

diff --git a/packages/app_center/pubspec.yaml b/packages/app_center/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: 'none'
 
 environment:
   sdk: '>=3.1.0 <4.0.0'
-  flutter: 3.13.9
+  flutter: 3.16.4
 
 dependencies:
   app_center_ratings_client: ^1.0.0
@@ -43,7 +43,7 @@ dependencies:
   ubuntu_logger: ^0.1.0
   ubuntu_service: ^0.3.0
   ubuntu_test: ^0.1.0-0
-  ubuntu_widgets: ^0.3.0
+  ubuntu_widgets: ^0.3.1
   url_launcher: ^6.2.1
   xdg_directories: ^1.0.3
   yaru: ^1.2.0

diff --git a/packages/app_center_ratings_client/lib/src/chart.freezed.dart b/packages/app_center_ratings_client/lib/src/chart.freezed.dart
@@ -115,7 +115,7 @@ class _$ChartDataImpl implements _ChartData {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ChartDataImpl &&

diff --git a/packages/app_center_ratings_client/lib/src/user.freezed.dart b/packages/app_center_ratings_client/lib/src/user.freezed.dart
@@ -142,7 +142,7 @@ class _$VoteImpl implements _Vote {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$VoteImpl &&

diff --git a/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart b/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.3 from annotations
+// Mocks generated by Mockito 5.4.4 from annotations
 // in app_center_ratings_client/test/ratings_client_test.dart.
 // Do not manually edit this file.
 

diff --git 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.13.9
+    source-tag: 3.16.4
     source-depth: 1
     plugin: nil
     override-build: |