diff --git a/example/pubspec.lock b/example/pubspec.lock index ad812b07..424a36c2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -223,6 +223,13 @@ packages: relative: true source: path version: "1.4.2" + floor_common: + dependency: transitive + description: + path: "../floor_common" + relative: true + source: path + version: "1.2.0" floor_generator: dependency: "direct dev" description: @@ -489,10 +496,10 @@ packages: dependency: transitive description: name: sqlparser - sha256: dc384bb1f56d1384ce078edb5ff8247976abdab79d0c83e437210c85f06ecb61 + sha256: "7b20045d1ccfb7bc1df7e8f9fee5ae58673fce6ff62cefbb0e0fd7214e90e5a0" url: "https://pub.dev" source: hosted - version: "0.34.0" + version: "0.34.1" stack_trace: dependency: transitive description: @@ -529,10 +536,10 @@ packages: dependency: transitive description: name: strings - sha256: "1f3db7347b8dfd9844ee7fb34883cffbe6cc723a63cb9f4a0aa19e619304b030" + sha256: b33f40c4dd3e597bf6d9e7f4f4dc282dad0f19b07d9f320cb5c2183859cbccf5 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.1" synchronized: dependency: transitive description: diff --git a/floor/pubspec.lock b/floor/pubspec.lock index e7b7661a..470a2e02 100644 --- a/floor/pubspec.lock +++ b/floor/pubspec.lock @@ -216,6 +216,13 @@ packages: relative: true source: path version: "1.4.2" + floor_common: + dependency: "direct main" + description: + path: "../floor_common" + relative: true + source: path + version: "1.2.0" floor_generator: dependency: "direct dev" description: @@ -301,26 +308,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: cdd14e3836065a1f6302a236ec8b5f700695c803c57ae11a1c84df31e6bcf831 + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" url: "https://pub.dev" source: hosted - version: "10.0.3" + version: "10.0.0" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9b2ef90589911d665277464e0482b209d39882dffaaf4ef69a3561a3354b2ebc" + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "2.0.1" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: fd3cd66cb2bcd7b50dcd3b413af49d78051f809c8b3f6e047962765c15a0d23d + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "2.0.1" lists: dependency: transitive description: @@ -554,10 +561,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.6.1" timing: dependency: transitive description: @@ -594,10 +601,10 @@ packages: dependency: transitive description: name: vm_service - sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246 + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "14.0.0" + version: "13.0.0" watcher: dependency: transitive description: @@ -624,4 +631,4 @@ packages: version: "3.1.1" sdks: dart: ">=3.2.6 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.7.0" diff --git a/floor/pubspec.yaml b/floor/pubspec.yaml index e40ebb44..d384651c 100644 --- a/floor/pubspec.yaml +++ b/floor/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: path: ^1.9.0 sqflite: ^2.3.2 sqflite_common_ffi: ^2.3.2+1 - sqlparser: ^0.34.0 + sqlparser: ^0.34.1 dev_dependencies: build_runner: ^2.4.8 diff --git a/floor_common/lib/floor_common.dart b/floor_common/lib/floor_common.dart index 762ec968..11b7e1fd 100644 --- a/floor_common/lib/floor_common.dart +++ b/floor_common/lib/floor_common.dart @@ -8,5 +8,4 @@ export 'package:floor_common/src/adapter/query_adapter.dart'; export 'package:floor_common/src/adapter/update_adapter.dart'; export 'package:floor_common/src/callback.dart'; export 'package:floor_common/src/database.dart'; -export 'package:floor_common/src/database_factory_ext.dart'; export 'package:floor_common/src/migration.dart'; diff --git a/floor_common/lib/src/database_factory_ext.dart b/floor_common/lib/src/database_factory_ext.dart deleted file mode 100644 index 8f50ac2b..00000000 --- a/floor_common/lib/src/database_factory_ext.dart +++ /dev/null @@ -1,9 +0,0 @@ -import 'package:path/path.dart'; -import 'package:sqflite_common/sqlite_api.dart'; - -extension DatabaseFactoryExtension on DatabaseFactory { - Future getDatabasePath(final String name) async { - final databasesPath = await this.getDatabasesPath(); - return join(databasesPath, name); - } -} diff --git a/floor_common/pubspec.lock b/floor_common/pubspec.lock index 382afc07..01a79e44 100644 --- a/floor_common/pubspec.lock +++ b/floor_common/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "67.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "6.4.1" args: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: db4766341bd8ecb66556f31ab891a5d596ef829221993531bd64a8e6342f0cda + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: build - sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" build_config: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" + sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "4.0.0" build_resolvers: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "93f05c041932674be039b0a2323d6cf57e5f2bbf884a3c0382f9e53fc45ebace" + sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.8" build_runner_core: dependency: transitive description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: ffi - sha256: "35d0f481d939de0d640b3db9a7aa36a52cd22054a798a73b4f50bdad5ce12678" + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "2.1.2" file: dependency: transitive description: @@ -224,10 +224,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "6d2930621b9377f6a4b7d260fce525d48dd77a334f0d5d4177d07b0dcb76c032" + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "3.2.0" glob: dependency: transitive description: @@ -240,10 +240,10 @@ packages: dependency: transitive description: name: graphs - sha256: ae0b3d956ff324c6f8671f08dcb2dbd71c99cdbf2aa3ca63a14190c47aa6679c + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.1" http_multi_server: dependency: transitive description: @@ -304,10 +304,10 @@ packages: dependency: "direct dev" description: name: matcher - sha256: "2e2c34e631f93410daa3ee3410250eadc77ac6befc02a040eda8a123f34e6f5a" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: @@ -336,10 +336,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059 + sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.4.4" node_preamble: dependency: transitive description: @@ -352,18 +352,18 @@ packages: dependency: transitive description: name: package_config - sha256: a4d5ede5ca9c3d88a2fef1147a078570c861714c806485c596b109819135bc12 + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" path: dependency: "direct main" description: name: path - sha256: "240ed0e9bd73daa2182e33c4efc68c7dd53c7c656f3da73515a2d163e151412d" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.9.0" pool: dependency: transitive description: @@ -376,10 +376,10 @@ packages: dependency: transitive description: name: pub_semver - sha256: b5a5fcc6425ea43704852ba4453ba94b08c2226c63418a260240c3a054579014 + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.4" pubspec_parse: dependency: transitive description: @@ -461,42 +461,42 @@ packages: dependency: "direct main" description: name: sqflite - sha256: f83e4c46d693b02436348a3a8693fa0fa50b0d98eeb55afc7579b70b0d8967f6 + sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.3.2" sqflite_common: dependency: "direct main" description: name: sqflite_common - sha256: c65f003175e4d0559af8180000eec451479b1017bd6c7a7d446c9ae3fecbea0a + sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.5.3" sqflite_common_ffi: dependency: "direct dev" description: name: sqflite_common_ffi - sha256: "1756ff13ce9c078d977068954187d0efc1cd3d6d450f7147b2cae486acf01806" + sha256: "754927d82de369a6b9e760fb60640aa81da650f35ffd468d5a992814d6022908" url: "https://pub.dev" source: hosted - version: "2.1.0+2" + version: "2.3.2+1" sqlite3: dependency: transitive description: name: sqlite3 - sha256: "88009712a98743bd476111c03d8064aea7ae12650a66ca62f866e121c3380d90" + sha256: "072128763f1547e3e9b4735ce846bfd226d68019ccda54db4cd427b12dfdedc9" url: "https://pub.dev" source: hosted - version: "1.5.1" + version: "2.4.0" sqlparser: dependency: "direct main" description: name: sqlparser - sha256: "91f47610aa54d8abf9d795a7b4e49b2a788f65d7493d5a68fbf180c3cbcc6f38" + sha256: "7b20045d1ccfb7bc1df7e8f9fee5ae58673fce6ff62cefbb0e0fd7214e90e5a0" url: "https://pub.dev" source: hosted - version: "0.27.0" + version: "0.34.1" stack_trace: dependency: transitive description: @@ -533,10 +533,10 @@ packages: dependency: transitive description: name: strings - sha256: "5af86299505c299640f5564e187c1a2ee9d6308c540e8d65f6385f5c67019122" + sha256: b33f40c4dd3e597bf6d9e7f4f4dc282dad0f19b07d9f320cb5c2183859cbccf5 url: "https://pub.dev" source: hosted - version: "0.2.2" + version: "3.1.1" synchronized: dependency: transitive description: @@ -557,26 +557,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "5301f54eb6fe945daa99bc8df6ece3f88b5ceaa6f996f250efdaaf63e22886be" + sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" url: "https://pub.dev" source: hosted - version: "1.23.1" + version: "1.25.2" test_api: dependency: transitive description: name: test_api - sha256: "6182294da5abf431177fccc1ee02401f6df30f766bc6130a0852c6b6d7ee6b2d" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.4.18" + version: "0.7.0" test_core: dependency: transitive description: name: test_core - sha256: d2e9240594b409565524802b84b7b39341da36dd6fd8e1660b53ad928ec3e9af + sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" url: "https://pub.dev" source: hosted - version: "0.4.24" + version: "0.6.0" timing: dependency: transitive description: @@ -621,10 +621,10 @@ packages: dependency: transitive description: name: watcher - sha256: e42dfcc48f67618344da967b10f62de57e04bae01d9d3af4c2596f3712a88c99 + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" web_socket_channel: dependency: transitive description: @@ -650,5 +650,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=3.2.0-0 <4.0.0" - flutter: ">=1.10.0" + dart: ">=3.3.0-279.1.beta <4.0.0" + flutter: ">=3.7.0" diff --git a/floor_common/pubspec.yaml b/floor_common/pubspec.yaml index 12dac1ee..7eedbcb0 100644 --- a/floor_common/pubspec.yaml +++ b/floor_common/pubspec.yaml @@ -7,23 +7,23 @@ homepage: https://floor.codes publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=3.2.6 <4.0.0' dependencies: floor_annotation: path: ../floor_annotation/ - meta: ^1.7.0 - path: ^1.8.0 - sqflite_common: ^2.0.1+1 - sqflite: ^2.0.0+4 - sqlparser: ^0.27.0 + meta: + path: ^1.9.0 + sqflite_common: ^2.5.3 + sqflite: ^2.3.2 + sqlparser: ^0.34.1 dev_dependencies: - build_runner: ^2.1.2 - collection: ^1.15.0 + build_runner: ^2.4.8 + collection: ^1.18.0 floor_generator: path: ../floor_generator/ - sqflite_common_ffi: ^2.0.0+3 - test: ^1.20.1 - matcher: ^0.12.10 - mockito: ^5.0.15 + sqflite_common_ffi: ^2.3.2+1 + test: ^1.25.2 + matcher: ^0.12.16+1 + mockito: ^5.4.4 diff --git a/floor_ffi/pubspec.lock b/floor_ffi/pubspec.lock index 948ee9bf..1ef82e41 100644 --- a/floor_ffi/pubspec.lock +++ b/floor_ffi/pubspec.lock @@ -1,29 +1,45 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + characters: + dependency: transitive + description: + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" + source: hosted + version: "1.3.0" + charcode: + dependency: transitive + description: + name: charcode + sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + url: "https://pub.dev" + source: hosted + version: "1.3.1" collection: dependency: transitive description: name: collection - sha256: "6d4193120997ecfd09acf0e313f13dc122b119e5eca87ef57a7d065ec9183762" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.18.0" ffi: dependency: transitive description: name: ffi - sha256: d97fffd9d86f3dccc7a9059128b468a99320c69007cc9d41a3a1bda07d4e86dc + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "2.1.2" floor_annotation: dependency: "direct main" description: path: "../floor_annotation" relative: true source: path - version: "1.0.1" + version: "1.4.2" floor_common: dependency: "direct main" description: @@ -31,46 +47,96 @@ packages: relative: true source: path version: "1.2.0" + flutter: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + url: "https://pub.dev" + source: hosted + version: "0.8.0" meta: dependency: "direct main" description: name: meta - sha256: "5202fdd37b4da5fd14a237ed0a01cad6c1efd4c99b5b5a0d3c9237f3728c9485" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.11.0" path: dependency: "direct main" description: name: path - sha256: "2ad4cddff7f5cc0e2d13069f2a3f7a73ca18f66abd6f5ecf215219cdb3638edb" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" + source: hosted + version: "1.9.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + sqflite: + dependency: transitive + description: + name: sqflite + sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "2.3.2" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "75e99c238f22152669c39e02a3cdcf78515d11856a8a78e0136452943404d9bd" + sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" url: "https://pub.dev" source: hosted - version: "2.0.1+1" + version: "2.5.3" sqflite_common_ffi: dependency: "direct main" description: name: sqflite_common_ffi - sha256: "29566b30e9bc81731e02dcf314437d9d9af8326f1a9f485cf8b510092287b75f" + sha256: "754927d82de369a6b9e760fb60640aa81da650f35ffd468d5a992814d6022908" url: "https://pub.dev" source: hosted - version: "2.0.0+3" + version: "2.3.2+1" sqlite3: dependency: transitive description: name: sqlite3 - sha256: e41c802d493ab234cb4d1c8c51f8542f77192038a6f373b886346bad00ba4b84 + sha256: "072128763f1547e3e9b4735ce846bfd226d68019ccda54db4cd427b12dfdedc9" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "2.4.0" + sqlparser: + dependency: transitive + description: + name: sqlparser + sha256: "7b20045d1ccfb7bc1df7e8f9fee5ae58673fce6ff62cefbb0e0fd7214e90e5a0" + url: "https://pub.dev" + source: hosted + version: "0.34.1" synchronized: dependency: transitive description: @@ -79,5 +145,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" sdks: - dart: ">=2.12.0 <4.0.0" + dart: ">=3.3.0-279.1.beta <4.0.0" + flutter: ">=3.7.0" diff --git a/floor_ffi/pubspec.yaml b/floor_ffi/pubspec.yaml index a6084ba7..50d36991 100644 --- a/floor_ffi/pubspec.yaml +++ b/floor_ffi/pubspec.yaml @@ -7,13 +7,13 @@ homepage: https://floor.codes publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=3.2.6 <4.0.0' dependencies: floor_annotation: path: ../floor_annotation/ floor_common: path: ../floor_common/ - meta: ^1.7.0 - path: ^1.8.0 - sqflite_common_ffi: ^2.0.0+3 + meta: + path: ^1.9.0 + sqflite_common_ffi: ^2.3.2+1