From fdc4bae507b15fe8564e472bea56303630699724 Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Mon, 28 Apr 2025 01:08:31 +0530 Subject: [PATCH] [client] Migrate to Hive CE --- client/lib/integrations/download_manager.dart | 4 ++-- client/lib/libphylum/db/db.dart | 2 +- .../libphylum/repositories/bookmark_repository.dart | 2 +- .../libphylum/repositories/resource_repository.dart | 2 +- .../lib/libphylum/repositories/trash_repository.dart | 2 +- client/lib/main.dart | 2 +- client/pubspec.lock | 12 ++++++------ client/pubspec.yaml | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/lib/integrations/download_manager.dart b/client/lib/integrations/download_manager.dart index 21448a02..a23029ed 100644 --- a/client/lib/integrations/download_manager.dart +++ b/client/lib/integrations/download_manager.dart @@ -1,3 +1,3 @@ export 'download_manager_stub.dart' - if (dart.library.html) 'download_manager_web.dart' - if (dart.library.io) 'download_manager_vm.dart'; + if (dart.library.js_interop) 'download_manager_web.dart' + if (dart.library.ffi) 'download_manager_vm.dart'; diff --git a/client/lib/libphylum/db/db.dart b/client/lib/libphylum/db/db.dart index de97000b..3664b834 100644 --- a/client/lib/libphylum/db/db.dart +++ b/client/lib/libphylum/db/db.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:drift/drift.dart'; -import 'db_stub.dart' if (dart.library.ffi) 'db_vm.dart' if (dart.library.html) 'db_wasm.dart'; +import 'db_stub.dart' if (dart.library.ffi) 'db_vm.dart' if (dart.library.js_interop) 'db_wasm.dart'; part 'db.g.dart'; diff --git a/client/lib/libphylum/repositories/bookmark_repository.dart b/client/lib/libphylum/repositories/bookmark_repository.dart index 532adfb3..5f780351 100644 --- a/client/lib/libphylum/repositories/bookmark_repository.dart +++ b/client/lib/libphylum/repositories/bookmark_repository.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:drift/drift.dart'; -import 'package:hive/hive.dart'; +import 'package:hive_ce/hive.dart'; import 'package:offtheline/offtheline.dart'; import 'package:phylum/libphylum/actions/action_resource_bookmark_add.dart'; import 'package:phylum/libphylum/actions/action_resource_bookmark_remove.dart'; diff --git a/client/lib/libphylum/repositories/resource_repository.dart b/client/lib/libphylum/repositories/resource_repository.dart index 80e870a2..bf25af74 100644 --- a/client/lib/libphylum/repositories/resource_repository.dart +++ b/client/lib/libphylum/repositories/resource_repository.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:drift/drift.dart'; import 'package:file_selector/file_selector.dart'; -import 'package:hive/hive.dart'; +import 'package:hive_ce/hive.dart'; import 'package:mime/mime.dart'; import 'package:offtheline/offtheline.dart'; import 'package:path/path.dart'; diff --git a/client/lib/libphylum/repositories/trash_repository.dart b/client/lib/libphylum/repositories/trash_repository.dart index ff96c8c4..9dcc2462 100644 --- a/client/lib/libphylum/repositories/trash_repository.dart +++ b/client/lib/libphylum/repositories/trash_repository.dart @@ -1,5 +1,5 @@ import 'package:drift/drift.dart'; -import 'package:hive/hive.dart'; +import 'package:hive_ce/hive.dart'; import 'package:offtheline/offtheline.dart'; import 'package:phylum/libphylum/db/db.dart'; import 'package:phylum/libphylum/phylum_account.dart'; diff --git a/client/lib/main.dart b/client/lib/main.dart index 65b55a54..b318df05 100644 --- a/client/lib/main.dart +++ b/client/lib/main.dart @@ -4,7 +4,7 @@ import 'package:drift/drift.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_state_notifier/flutter_state_notifier.dart'; -import 'package:hive/hive.dart'; +import 'package:hive_ce/hive.dart'; import 'package:logger/logger.dart'; import 'package:offtheline/offtheline.dart'; import 'package:path/path.dart' as path; diff --git a/client/pubspec.lock b/client/pubspec.lock index a4aa3554..f05b50a1 100644 --- a/client/pubspec.lock +++ b/client/pubspec.lock @@ -416,14 +416,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" - hive: + hive_ce: dependency: "direct main" description: - name: hive - sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" + name: hive_ce + sha256: ac66daee46ad46486a1ed12cf91e9d7479c875fb46889be8d2c96b557406647f url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.10.1" http: dependency: "direct main" description: @@ -596,8 +596,8 @@ packages: dependency: "direct main" description: path: "." - ref: eb83200ee1bdcaf069c6ae978b90b0b2b6f15a1f - resolved-ref: eb83200ee1bdcaf069c6ae978b90b0b2b6f15a1f + ref: "6cb005fcea01af5f5dd4c34e8d3f78e78ceb70fc" + resolved-ref: "6cb005fcea01af5f5dd4c34e8d3f78e78ceb70fc" url: "https://codeberg.org/shroff/offtheline.git" source: git version: "0.16.0" diff --git a/client/pubspec.yaml b/client/pubspec.yaml index 74d38882..66f39491 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: file_selector: ^1.0.3 flutter_state_notifier: background_downloader: - hive: + hive_ce: ^2.10.0 http: http_parser: intl: @@ -24,7 +24,7 @@ dependencies: offtheline: git: url: https://codeberg.org/shroff/offtheline.git - ref: eb83200ee1bdcaf069c6ae978b90b0b2b6f15a1f + ref: 6cb005fcea01af5f5dd4c34e8d3f78e78ceb70fc open_file: path: path_provider: