Merge branch 'main' into fix-spelling

.github/workflows/ci.yaml

@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: asdf-vm/actions/install@v2
-      - uses: bluefireteam/melos-action@v2
+      - uses: bluefireteam/melos-action@v3
       - run: melos generate
       - name: Check for outdated mocks
         if: github.event_name != 'push'

.github/workflows/integration-test.yaml

@@ -13,6 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: asdf-vm/actions/install@v2
+      - uses: bluefireteam/melos-action@v3
       - 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: |

.github/workflows/snap.yaml

@@ -14,6 +14,8 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
+      - uses: asdf-vm/actions/install@v2
+      - uses: bluefireteam/melos-action@v3
       - uses: snapcore/action-build@v1
         id: snapcraft
       - uses: actions/upload-artifact@v3

.gitignore

@@ -47,3 +47,6 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+# Melos generated files
+**/pubspec_overrides.yaml

packages/app_center/lib/main.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:app_center_ratings_client/ratings_client.dart';
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:github/github.dart';

packages/app_center/lib/src/ratings/exports.dart

@@ -1,2 +1 @@
-export 'package:app_center_ratings_client/src/app.dart';
 export 'package:app_center_ratings_client/src/user.dart';

packages/app_center/lib/src/ratings/ratings_l10n.dart

@@ -1,7 +1,7 @@
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:flutter/material.dart';
 
-import '/l10n.dart';
-import 'exports.dart';
+import '../../l10n.dart';
 
 extension RatingsBandL10n on RatingsBand {
   String localize(AppLocalizations l10n) {

packages/app_center/lib/src/ratings/ratings_model.dart

@@ -1,3 +1,4 @@
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

packages/app_center/lib/src/ratings/ratings_service.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:app_center_ratings_client/ratings_client.dart';
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:crypto/crypto.dart';
 import 'package:flutter/material.dart';
 import 'package:glib/glib.dart';

packages/app_center/pubspec.yaml

@@ -13,10 +13,7 @@ dependencies:
   cached_network_image: ^3.3.0
   collection: ^1.17.2
   dbus: ^0.7.10
-  app_center_ratings_client:
-    git:
-      url: https://github.com/matthew-hagemann/app_center_ratings_client.dart.git
-      ref: main
+  app_center_ratings_client: ^1.0.0
   crypto: ^3.0.3
   file: ^6.1.4
   flutter:

packages/app_center/test/app_card_test.dart

@@ -1,5 +1,6 @@
 import 'package:app_center/ratings.dart';
 import 'package:app_center/widgets.dart';
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:snapd/snapd.dart';

packages/app_center/test/ratings_model_test.dart

@@ -1,4 +1,5 @@
 import 'package:app_center/ratings.dart';
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:clock/clock.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';

packages/app_center/test/ratings_service_test.dart

@@ -1,5 +1,6 @@
 import 'package:app_center/src/ratings/exports.dart';
 import 'package:app_center/src/ratings/ratings_service.dart';
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 

packages/app_center/test/search_page_test.dart

@@ -2,6 +2,7 @@ import 'package:app_center/ratings.dart';
 import 'package:app_center/search.dart';
 import 'package:app_center/snapd.dart';
 import 'package:app_center/widgets.dart';
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:snapd/snapd.dart';

packages/app_center/test/snap_page_test.dart

@@ -2,6 +2,7 @@ import 'package:app_center/l10n.dart';
 import 'package:app_center/ratings.dart';
 import 'package:app_center/snapd.dart';
 import 'package:app_center/widgets.dart';
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';

packages/app_center/test/test_utils.dart

@@ -8,7 +8,7 @@ import 'package:app_center/ratings.dart';
 import 'package:app_center/snapd.dart';
 import 'package:app_center/src/deb/deb_model.dart';
 import 'package:app_center/src/manage/manage_model.dart';
-import 'package:app_center_ratings_client/ratings_client.dart';
+import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:appstream/appstream.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';