feat(fmc): update cache store dependencies (#82)

Bump version to 1.5.3
Fix #81

---------

Co-authored-by: Joscha Eckert <34318751+josxha@users.noreply.github.com>

Author: ZhuJHua

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [ "josxha" ]
+custom: [ "https://paypal.me/joschaeckert" ]

README.md

@@ -19,7 +19,7 @@ functionality of [flutter_map](https://pub.dev/packages/flutter_map).
 
 ## Packages
 
-### [flutter_map_cache](https://pub.dev/packages/flutter_map_cache)
+### [flutter_map_cache](https://github.com/josxha/flutter_map_plugins/tree/main/flutter_map_cache)
 
 [![Pub Version](https://img.shields.io/pub/v/flutter_map_cache)](https://pub.dev/packages/flutter_map_cache)
 [![likes](https://img.shields.io/pub/likes/flutter_map_cache?logo=flutter)](https://pub.dev/packages/flutter_map_cache)
@@ -33,7 +33,7 @@ storage backend you would possibly want.
   and flutter_map.
 - Support for tile cancellation
 
-### [flutter_map_compass](https://pub.dev/packages/flutter_map_compass)
+### [flutter_map_compass](https://github.com/josxha/flutter_map_plugins/tree/main/flutter_map_compass)
 
 [![Pub Version](https://img.shields.io/pub/v/flutter_map_compass)](https://pub.dev/packages/flutter_map_compass)
 [![likes](https://img.shields.io/pub/likes/flutter_map_compass?logo=flutter)](https://pub.dev/packages/flutter_map_compass)
@@ -42,7 +42,7 @@ storage backend you would possibly want.
 A compass for flutter_map that indicates the map rotation. It rotates the map
 back to north on top when clicked.
 
-### [flutter_map_maplibre](https://pub.dev/packages/flutter_map_maplibre)
+### [flutter_map_maplibre](https://github.com/josxha/flutter_map_plugins/tree/main/flutter_map_maplibre)
 
 [![Pub Version](https://img.shields.io/pub/v/flutter_map_maplibre)](https://pub.dev/packages/flutter_map_maplibre)
 [![likes](https://img.shields.io/pub/likes/flutter_map_maplibre?logo=flutter)](https://pub.dev/packages/flutter_map_maplibre)
@@ -51,7 +51,7 @@ back to north on top when clicked.
 Performant Mapbox Vector Tiles (MVT) support for flutter_map powered by native
 MapLibre SDKs.
 
-### [flutter_map_mbtiles](https://pub.dev/packages/flutter_map_mbtiles)
+### [flutter_map_mbtiles](https://github.com/josxha/flutter_map_plugins/tree/main/flutter_map_mbtiles)
 
 [![Pub Version](https://img.shields.io/pub/v/flutter_map_mbtiles)](https://pub.dev/packages/flutter_map_mbtiles)
 [![likes](https://img.shields.io/pub/likes/flutter_map_mbtiles?logo=flutter)](https://pub.dev/packages/flutter_map_mbtiles)
@@ -64,7 +64,7 @@ flutter_map tile layers.
   for the MBTiles support.
 - MBTiles is a file format to store map tiles in a single SQLite database.
 
-### [flutter_map_pmtiles](https://pub.dev/packages/flutter_map_pmtiles)
+### [flutter_map_pmtiles](https://github.com/josxha/flutter_map_plugins/tree/main/flutter_map_pmtiles)
 
 [![Pub Version](https://img.shields.io/pub/v/flutter_map_pmtiles)](https://pub.dev/packages/flutter_map_pmtiles)
 [![likes](https://img.shields.io/pub/likes/flutter_map_pmtiles?logo=flutter)](https://pub.dev/packages/flutter_map_pmtiles)
@@ -80,7 +80,7 @@ flutter_map tile layers.
   learn more about
   PMTiles.
 
-### [vector_map_tiles_mbtiles](https://pub.dev/packages/vector_map_tiles_mbtiles)
+### [vector_map_tiles_mbtiles](https://github.com/josxha/flutter_map_plugins/tree/main/vector_map_tiles_mbtiles)
 
 [![Pub Version](https://img.shields.io/pub/v/vector_map_tiles_mbtiles)](https://pub.dev/packages/vector_map_tiles_mbtiles)
 [![likes](https://img.shields.io/pub/likes/vector_map_tiles_mbtiles?logo=flutter)](https://pub.dev/packages/vector_map_tiles_mbtiles)
@@ -94,7 +94,7 @@ adds support for vector tiles to flutter_map.
   for the MBTiles support.
 - MBTiles is a file format to store map tiles in a single SQLite database.
 
-### [vector_map_tiles_pmtiles](https://pub.dev/packages/vector_map_tiles_pmtiles)
+### [vector_map_tiles_pmtiles](https://github.com/josxha/flutter_map_plugins/tree/main/vector_map_tiles_pmtiles)
 
 [![Pub Version](https://img.shields.io/pub/v/vector_map_tiles_pmtiles)](https://pub.dev/packages/vector_map_tiles_pmtiles)
 [![likes](https://img.shields.io/pub/likes/vector_map_tiles_pmtiles?logo=flutter)](https://pub.dev/packages/vector_map_tiles_pmtiles)

example/lib/flutter_map_cache/cache_store_types.dart

@@ -1,10 +1,10 @@
 import 'dart:io';
 
 import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
-import 'package:dio_cache_interceptor_db_store/dio_cache_interceptor_db_store.dart';
-import 'package:dio_cache_interceptor_file_store/dio_cache_interceptor_file_store.dart';
-import 'package:dio_cache_interceptor_hive_store/dio_cache_interceptor_hive_store.dart';
 import 'package:flutter/material.dart';
+import 'package:http_cache_drift_store/http_cache_drift_store.dart';
+import 'package:http_cache_file_store/http_cache_file_store.dart';
+import 'package:http_cache_hive_store/http_cache_hive_store.dart';
 
 enum CacheStoreTypes {
   memCache('MemCache'),
@@ -18,7 +18,7 @@ enum CacheStoreTypes {
 
   CacheStore getCacheStore(String path) => switch (this) {
         CacheStoreTypes.memCache => MemCacheStore(),
-        CacheStoreTypes.dbCache => DbCacheStore(
+        CacheStoreTypes.dbCache => DriftCacheStore(
             databasePath: path,
             databaseName: 'DbCacheStore',
           ),
@@ -33,7 +33,7 @@ enum CacheStoreTypes {
 
   CacheStore getCacheStoreWeb() => switch (this) {
         CacheStoreTypes.memCache => MemCacheStore(),
-        CacheStoreTypes.dbCache => DbCacheStore(
+        CacheStoreTypes.dbCache => DriftCacheStore(
             databasePath: '', // ignored on web
             databaseName: 'DbCacheStore',
           ),

example/pubspec.yaml

@@ -18,10 +18,10 @@ dependencies:
   connectivity_plus: ^6.0.0
   path_provider: ^2.0.15
   dio: ^5.2.0+1
-  dio_cache_interceptor: ^3.4.2
-  dio_cache_interceptor_db_store: ^6.0.0
-  dio_cache_interceptor_file_store: ^1.2.2
-  dio_cache_interceptor_hive_store: ^4.0.0
+  dio_cache_interceptor: ^4.0.0
+  http_cache_drift_store: ^7.0.0
+  http_cache_file_store: ^2.0.0
+  http_cache_hive_store: ^5.0.0
   sqlite3_flutter_libs: ^0.5.15
   #  vector_map_tiles: ^8.0.0
   # vector_tile_renderer: ^6.0.0

flutter_map_cache/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [2.0.0] 2025-04-06
+
+- Use
+  [dio_cache_interceptor: ^4.0.0](https://pub.dev/packages/dio_cache_interceptor/changelog#400)
+- Remove deprecated `dioOptions` parameter
+- Add
+  [hitCacheOnNetworkFailure](https://pub.dev/documentation/dio_cache_interceptor/latest/dio_cache_interceptor/CacheOptions/hitCacheOnNetworkFailure.html)
+- Remove `hitCacheOnErrorExcept` in favor of the
+  new [hitCacheOnErrorCodes](https://pub.dev/documentation/dio_cache_interceptor/latest/dio_cache_interceptor/CacheOptions/hitCacheOnErrorCodes.html)
+
+Please update your integration and used store packages according to
+the [Getting Started section](https://pub.dev/packages/flutter_map_cache#getting-started).
+More information can be found in
+the [dio_cache_interceptor changelog](https://pub.dev/packages/dio_cache_interceptor/changelog#400).
+
 ## [1.5.2] 2025-02-05
 
 - Support for flutter_map v6, v7 and v8

flutter_map_cache/README.md

@@ -40,9 +40,10 @@ Supported storage backends are:
 | In-Memory                                       | - For testing purposes<br/>- `flutter_map` has memory caching itself                                           |
 | File System                                     | - Easy to setup, no additional storage backend package required<br/>- potentially slower than using a database |
 | [Drift](https://pub.dev/packages/drift)         | - SQLite database<br/>- good platform support                                                                  |
-| [Hive](https://pub.dev/packages/hive)           | - key-value database<br/>- easy to integrate                                                                   |
-| [ObjectBox](https://pub.dev/packages/objectbox) | - NoSQL, ACID compliant<br/>- Fast library<br/>- More complex integration                                      |
-| [Isar](https://pub.dev/packages/isar)           | - NoSQL<br/>- Fast library<br/>- More complex integration                                                      |
+| [Hive CE](https://pub.dev/packages/hive_ce)     | - key-value database<br/>- easy to integrate                                                                   |
+| [ObjectBox](https://pub.dev/packages/objectbox) | - NoSQL database<br/>- More complex integration                                                                |
+| [Isar](https://pub.dev/packages/isar)           | - NoSQL database<br/>- More complex integration                                                                |
+| [Sembast](https://pub.dev/packages/sembast)     | - NoSQL database                                                                                               |
 
 Other storage backends will be supported as soon as the underlying package
 [dio_cache_interceptor](https://pub.dev/packages/dio_cache_interceptor) supports
@@ -60,22 +61,28 @@ dependencies:
   path_provider: ^2.1.2 # in case the storage backend requires a path
 
   # drift
-  dio_cache_interceptor_db_store: ^5.1.0
+  http_cache_drift_store: ^7.0.0
   sqlite3_flutter_libs: ^0.5.15
 
   # file system
-  dio_cache_interceptor_file_store: ^1.2.2
+  http_cache_file_store: ^2.0.0
 
   # hive
-  dio_cache_interceptor_hive_store: ^3.2.1
+  http_cache_hive_store: ^5.0.0
 
   # objectbox
-  dio_cache_interceptor_objectbox_store: ^1.1.3
+  http_cache_objectbox_store: ^2.0.0
   objectbox_flutter_libs: ^1.4.1
 
   # isar
+  http_cache_isar_store: ^2.0.0
   isar: ^3.1.0+1
   isar_flutter_libs: ^3.1.0+1
+
+  # sembast
+  http_cache_sembast_store: ^1.0.0
+  sembast: ^3.8.4+1
+  sembast_web: ^2.4.1
 ```
 
 2. ⚠️ Some storage backends have their own required setups. Please check them
@@ -181,7 +188,7 @@ class MyMap extends StatelessWidget {
 import 'dart:io';
 
 import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
-import 'package:dio_cache_interceptor_file_store/dio_cache_interceptor_file_store.dart';
+import 'package:http_cache_file_store/http_cache_file_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map_cache/flutter_map_cache.dart';

flutter_map_cache/lib/src/cached_tile_provider.dart

@@ -19,25 +19,13 @@ class CachedTileProvider extends TileProvider {
     required CacheStore store,
     CachePolicy cachePolicy = CachePolicy.forceCache,
     Dio? dio,
-    @Deprecated(
-      '''
-      This parameter will be removed in version 2.0.0 of flutter_map_cache.
-      
-      Please use the `dio` parameter instead and provide your own Dio instance.
-      
-        CachedTileProvider(
-          dio: Dio(
-            BaseOptions(...),
-          ),
-        ),
-  ''',
-    )
-    BaseOptions? dioOptions,
     List<Interceptor>? interceptors,
     Duration? maxStale,
     CacheKeyBuilder? keyBuilder,
-    List<int>? hitCacheOnErrorExcept = defaultHitCacheOnErrorExcept,
-  }) : dio = dio ?? Dio(dioOptions ?? BaseOptions()) {
+    List<int> hitCacheOnErrorCodes =
+        CachedTileProvider.defaultHitCacheOnErrorCodes,
+    bool hitCacheOnNetworkFailure = true,
+  }) : dio = dio ?? Dio() {
     this.dio.interceptors.addAll([
       ...?interceptors,
       DioCacheInterceptor(
@@ -47,7 +35,8 @@ class CachedTileProvider extends TileProvider {
           policy: cachePolicy,
           maxStale: maxStale,
           keyBuilder: keyBuilder ?? CacheOptions.defaultCacheKeyBuilder,
-          hitCacheOnErrorExcept: hitCacheOnErrorExcept,
+          hitCacheOnErrorCodes: hitCacheOnErrorCodes,
+          hitCacheOnNetworkFailure: hitCacheOnNetworkFailure,
         ),
       ),
     ]);
@@ -56,14 +45,13 @@ class CachedTileProvider extends TileProvider {
   /// dio http client
   final Dio dio;
 
-  /// list of http status codes that will not hit the cache, e.g. if the user
-  /// needs authentication or the server is currently not able to handle the
-  /// request
-  static const List<int> defaultHitCacheOnErrorExcept = [
-    HttpStatus.unauthorized,
-    HttpStatus.forbidden,
-    HttpStatus.badGateway,
-  ];
+  /// List of HTTP status codes that allow to return a previous cached
+  /// response.
+  ///
+  /// If a request fails with a status code in this list,
+  /// the cached response (if available) will be used instead of treating
+  /// the error as a complete failure.
+  static const List<int> defaultHitCacheOnErrorCodes = [HttpStatus.notFound];
 
   @override
   bool get supportsCancelLoading => true;

flutter_map_cache/pubspec.yaml

@@ -1,11 +1,13 @@
 name: flutter_map_cache
 description: A slim yet powerful caching plugin for flutter_map tile layers.
-version: 1.5.2
+version: 2.0.0
 repository: https://github.com/josxha/flutter_map_plugins
 issue_tracker: https://github.com/josxha/flutter_map_plugins/issues
 resolution: workspace
-
 topics: [ flutter-map, map, cache, dio ]
+funding:
+  - https://paypal.me/joschaeckert
+  - https://github.com/sponsors/josxha
 
 platforms:
   android:
@@ -20,7 +22,7 @@ environment:
 
 dependencies:
   dio: ^5.2.0+1
-  dio_cache_interceptor: ^3.4.2
+  dio_cache_interceptor: ^4.0.0
   flutter:
     sdk: flutter
   flutter_map: ">=6.0.0 <9.0.0"

flutter_map_compass/pubspec.yaml

@@ -5,6 +5,9 @@ issue_tracker: https://github.com/josxha/flutter_map_plugins/issues
 topics: [ flutter-map, map ]
 version: 1.1.1
 resolution: workspace
+funding:
+  - https://paypal.me/joschaeckert
+  - https://github.com/sponsors/josxha
 
 environment:
   sdk: '>=3.6.0 <4.0.0'

flutter_map_maplibre/pubspec.yaml

@@ -5,6 +5,9 @@ topics: [ flutter-map, map, vector, maplibre, mvt ]
 repository: https://github.com/josxha/flutter_map_plugins
 issue_tracker: https://github.com/josxha/flutter_map_plugins/issues
 resolution: workspace
+funding:
+  - https://paypal.me/joschaeckert
+  - https://github.com/sponsors/josxha
 
 environment:
   sdk: '>=3.7.0 <4.0.0'

flutter_map_mbtiles/pubspec.yaml

@@ -5,6 +5,9 @@ repository: https://github.com/josxha/flutter_map_plugins
 issue_tracker: https://github.com/josxha/flutter_map_plugins/issues
 topics: [ flutter-map, mbtiles, map ]
 resolution: workspace
+funding:
+  - https://paypal.me/joschaeckert
+  - https://github.com/sponsors/josxha
 
 environment:
   sdk: ">=3.6.0 <4.0.0"

flutter_map_pmtiles/pubspec.yaml

@@ -5,6 +5,9 @@ issue_tracker: https://github.com/josxha/flutter_map_plugins/issues
 topics: [ flutter-map, map, pmtiles ]
 version: 1.0.5
 resolution: workspace
+funding:
+  - https://paypal.me/joschaeckert
+  - https://github.com/sponsors/josxha
 
 environment:
   sdk: '>=3.6.0 <4.0.0'

vector_map_tiles_mbtiles/pubspec.yaml

@@ -5,6 +5,9 @@ issue_tracker: https://github.com/josxha/flutter_map_plugins/issues
 topics: [ flutter-map, vector-map-tiles, map, mbtiles ]
 version: 1.2.1
 resolution: workspace
+funding:
+  - https://paypal.me/joschaeckert
+  - https://github.com/sponsors/josxha
 
 environment:
   sdk: '>=3.6.0 <4.0.0'

vector_map_tiles_pmtiles/pubspec.yaml

@@ -5,6 +5,9 @@ issue_tracker: https://github.com/josxha/flutter_map_plugins/issues
 topics: [ flutter-map, vector-map-tiles, map, pmtiles ]
 version: 1.5.1
 resolution: workspace
+funding:
+  - https://paypal.me/joschaeckert
+  - https://github.com/sponsors/josxha
 
 environment:
   sdk: '>=3.6.0 <4.0.0'