diff --git a/packages/sqlite_async/lib/src/common/isolate_connection_factory.dart b/packages/sqlite_async/lib/src/common/isolate_connection_factory.dart index 90dc9b1..87e6176 100644 --- a/packages/sqlite_async/lib/src/common/isolate_connection_factory.dart +++ b/packages/sqlite_async/lib/src/common/isolate_connection_factory.dart @@ -30,8 +30,8 @@ abstract class IsolateConnectionFactory SerializedPortClient get upstreamPort; factory IsolateConnectionFactory( - {required openFactory, - required mutex, + {required dynamic /* platform-specific type */ openFactory, + required dynamic /* platform-specific type */ mutex, required SerializedPortClient upstreamPort}) { return IsolateConnectionFactoryImpl( openFactory: openFactory, diff --git a/packages/sqlite_async/lib/src/common/port_channel_native.dart b/packages/sqlite_async/lib/src/common/port_channel_native.dart index bb8318e..c9f8e6b 100644 --- a/packages/sqlite_async/lib/src/common/port_channel_native.dart +++ b/packages/sqlite_async/lib/src/common/port_channel_native.dart @@ -128,7 +128,7 @@ class ParentPortClient implements PortClient { _close(); } - tieToIsolate(Isolate isolate) { + void tieToIsolate(Isolate isolate) { _isolateDebugName = isolate.debugName; isolate.addErrorListener(_errorPort.sendPort); isolate.addOnExitListener(_receivePort.sendPort, response: _closeMessage); @@ -207,7 +207,7 @@ class RequestPortServer { RequestPortServer(this.port); - open(Future Function(Object? message) handle) { + PortServer open(Future Function(Object? message) handle) { return PortServer.forSendPort(port, handle); } } diff --git a/packages/sqlite_async/lib/src/common/port_channel_stub.dart b/packages/sqlite_async/lib/src/common/port_channel_stub.dart index 6c6e5cc..d5c50ae 100644 --- a/packages/sqlite_async/lib/src/common/port_channel_stub.dart +++ b/packages/sqlite_async/lib/src/common/port_channel_stub.dart @@ -53,7 +53,7 @@ class ParentPortClient implements PortClient { _stub(); } - tieToIsolate(Isolate isolate) { + void tieToIsolate(Isolate isolate) { _stub(); } } @@ -97,7 +97,7 @@ class RequestPortServer { RequestPortServer(this.port); - open(Future Function(Object? message) handle) { + PortServer open(Future Function(Object? message) handle) { _stub(); } } diff --git a/packages/sqlite_async/lib/src/common/sqlite_database.dart b/packages/sqlite_async/lib/src/common/sqlite_database.dart index 3201135..a73828a 100644 --- a/packages/sqlite_async/lib/src/common/sqlite_database.dart +++ b/packages/sqlite_async/lib/src/common/sqlite_database.dart @@ -70,7 +70,7 @@ abstract class SqliteDatabase /// /// A maximum of [maxReaders] concurrent read transactions are allowed. factory SqliteDatabase( - {required path, + {required String path, int maxReaders = SqliteDatabase.defaultMaxReaders, SqliteOptions options = const SqliteOptions.defaults()}) { return SqliteDatabaseImpl( diff --git a/packages/sqlite_async/lib/src/impl/stub_sqlite_database.dart b/packages/sqlite_async/lib/src/impl/stub_sqlite_database.dart index ee254f3..cc106a7 100644 --- a/packages/sqlite_async/lib/src/impl/stub_sqlite_database.dart +++ b/packages/sqlite_async/lib/src/impl/stub_sqlite_database.dart @@ -20,7 +20,7 @@ class SqliteDatabaseImpl int maxReaders; factory SqliteDatabaseImpl( - {required path, + {required String path, int maxReaders = SqliteDatabase.defaultMaxReaders, SqliteOptions options = const SqliteOptions.defaults()}) { throw UnimplementedError(); diff --git a/packages/sqlite_async/lib/src/native/database/native_sqlite_database.dart b/packages/sqlite_async/lib/src/native/database/native_sqlite_database.dart index 22cacf3..85b0dd0 100644 --- a/packages/sqlite_async/lib/src/native/database/native_sqlite_database.dart +++ b/packages/sqlite_async/lib/src/native/database/native_sqlite_database.dart @@ -54,7 +54,7 @@ class SqliteDatabaseImpl /// /// A maximum of [maxReaders] concurrent read transactions are allowed. factory SqliteDatabaseImpl( - {required path, + {required String path, int maxReaders = SqliteDatabase.defaultMaxReaders, SqliteOptions options = const SqliteOptions.defaults()}) { final factory = diff --git a/packages/sqlite_async/lib/src/native/native_isolate_connection_factory.dart b/packages/sqlite_async/lib/src/native/native_isolate_connection_factory.dart index 915d2ad..5cbb1a7 100644 --- a/packages/sqlite_async/lib/src/native/native_isolate_connection_factory.dart +++ b/packages/sqlite_async/lib/src/native/native_isolate_connection_factory.dart @@ -75,7 +75,7 @@ class _IsolateUpdateListener { return controller.stream; } - close() { + void close() { client.fire(UnsubscribeToUpdates(port.sendPort)); controller.close(); port.close(); diff --git a/packages/sqlite_async/lib/src/native/native_isolate_mutex.dart b/packages/sqlite_async/lib/src/native/native_isolate_mutex.dart index 7d82f68..9d1a212 100644 --- a/packages/sqlite_async/lib/src/native/native_isolate_mutex.dart +++ b/packages/sqlite_async/lib/src/native/native_isolate_mutex.dart @@ -159,7 +159,7 @@ class SharedMutex implements Mutex { }, zoneValues: {this: true}); } - _unlock() { + void _unlock() { client.fire(const _UnlockMessage()); } diff --git a/packages/sqlite_async/lib/src/sqlite_migrations.dart b/packages/sqlite_async/lib/src/sqlite_migrations.dart index a0c9991..7f2e5d8 100644 --- a/packages/sqlite_async/lib/src/sqlite_migrations.dart +++ b/packages/sqlite_async/lib/src/sqlite_migrations.dart @@ -25,7 +25,7 @@ class SqliteMigrations { SqliteMigrations({this.migrationTable = "_migrations"}); - add(SqliteMigration migration) { + void add(SqliteMigration migration) { assert( migrations.isEmpty || migrations.last.toVersion < migration.toVersion); @@ -48,7 +48,7 @@ class SqliteMigrations { } /// The current version as specified by the migrations. - get version { + int get version { return migrations.isEmpty ? 0 : migrations.last.toVersion; } @@ -68,7 +68,7 @@ class SqliteMigrations { } } - _validateCreateDatabase() { + void _validateCreateDatabase() { if (createDatabase != null) { if (createDatabase!.downMigration != null) { throw MigrationError("createDatabase may not contain down migrations"); @@ -229,7 +229,7 @@ class SqliteDownMigration { SqliteDownMigration({required this.toVersion}); /// Add an statement to execute to downgrade the database version. - add(String sql, [List? params]) { + void add(String sql, [List? params]) { _statements.add(_SqliteMigrationStatement(sql, params ?? [])); } } diff --git a/packages/sqlite_async/lib/src/web/database/web_sqlite_database.dart b/packages/sqlite_async/lib/src/web/database/web_sqlite_database.dart index 69f01ab..e129afa 100644 --- a/packages/sqlite_async/lib/src/web/database/web_sqlite_database.dart +++ b/packages/sqlite_async/lib/src/web/database/web_sqlite_database.dart @@ -56,7 +56,7 @@ class SqliteDatabaseImpl /// /// A maximum of [maxReaders] concurrent read transactions are allowed. factory SqliteDatabaseImpl( - {required path, + {required String path, int maxReaders = SqliteDatabase.defaultMaxReaders, SqliteOptions options = const SqliteOptions.defaults()}) { final factory = diff --git a/packages/sqlite_async/pubspec.yaml b/packages/sqlite_async/pubspec.yaml index 3d5130d..a5589d8 100644 --- a/packages/sqlite_async/pubspec.yaml +++ b/packages/sqlite_async/pubspec.yaml @@ -23,8 +23,8 @@ dependencies: dev_dependencies: build_runner: ^2.4.14 build_web_compilers: ^4.1.1 - build_test: ^2.2.3 - lints: ^5.0.0 + build_test: ^3.5.0 + lints: ^6.0.0 test: ^1.21.0 test_api: ^0.7.0 glob: ^2.1.1 diff --git a/packages/sqlite_async/test/watch_test.dart b/packages/sqlite_async/test/watch_test.dart index dc28add..1597aa0 100644 --- a/packages/sqlite_async/test/watch_test.dart +++ b/packages/sqlite_async/test/watch_test.dart @@ -8,7 +8,7 @@ import 'utils/test_utils_impl.dart'; final testUtils = TestUtils(); -createTables(SqliteDatabase db) async { +Future createTables(SqliteDatabase db) async { await db.writeTransaction((tx) async { await tx.execute( 'CREATE TABLE assets(id INTEGER PRIMARY KEY AUTOINCREMENT, make TEXT, customer_id INTEGER)');