From 24215f635e569de56ed864597c8f2d565bbf2d2e Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Mon, 23 Dec 2024 17:04:25 -0500 Subject: [PATCH] deps: Upgrade share_plus{,_platform_interface} enabling more upgrades MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Done with: flutter pub upgrade --major-versions share_plus{,_platform_interface} (then commit, for the sake of a no-uncommitted-files check) tools/upgrade pub (then squash) See discussion: https://chat.zulip.org/#narrow/channel/243-mobile-team/topic/deps.3A.20running.20.60tools.2Fupgrade.20pub.60.20twice/near/2013483 All the Firebase packages are now upgraded to latest; none of them appear in the `flutter pub outdated` list. This seems to have unlocked upgrading `drift` too. Some followups were needed: - ran `tools/check drift --all --fix` - ran `tools/check build_runner --all --fix` - followed an instruction from the analyzer: info • 'package:drift_dev/api/migrations.dart' is deprecated and shouldn't be used. Import `package:drift/migrations_native.dart` instead • test/model/database_test.dart:4:1 • deprecated_member_use Greg pointed out that it's awkward that some Drift files change, but he found that they're not substantive changes, so it's fine: https://github.com/zulip/zulip-flutter/pull/1184#discussion_r1894471558 https://github.com/zulip/zulip-flutter/pull/1184#discussion_r1894472486 --- ios/Podfile.lock | 32 +-- lib/model/database.g.dart | 251 ++++++++++++++---------- macos/Podfile.lock | 36 ++-- pubspec.lock | 56 +++--- pubspec.yaml | 4 +- test/model/database_test.dart | 2 +- test/model/schemas/drift_schema_v2.json | 2 +- test/model/schemas/schema.dart | 6 +- test/model/schemas/schema_v1.dart | 2 +- test/model/schemas/schema_v2.dart | 2 +- 10 files changed, 219 insertions(+), 174 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index dc7d95ea1e..a8e8b195a3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -37,19 +37,19 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/CoreOnly (11.0.0): - - FirebaseCore (= 11.0.0) - - Firebase/Messaging (11.0.0): + - Firebase/CoreOnly (11.4.0): + - FirebaseCore (= 11.4.0) + - Firebase/Messaging (11.4.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 11.0.0) - - firebase_core (3.4.0): - - Firebase/CoreOnly (= 11.0.0) + - FirebaseMessaging (~> 11.4.0) + - firebase_core (3.9.0): + - Firebase/CoreOnly (= 11.4.0) - Flutter - - firebase_messaging (15.1.0): - - Firebase/Messaging (= 11.0.0) + - firebase_messaging (15.1.6): + - Firebase/Messaging (= 11.4.0) - firebase_core - Flutter - - FirebaseCore (11.0.0): + - FirebaseCore (11.4.0): - FirebaseCoreInternal (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) @@ -60,7 +60,7 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.0.0): + - FirebaseMessaging (11.4.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) @@ -217,13 +217,13 @@ SPEC CHECKSUMS: DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 - Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9 - firebase_core: ceec591a66629daaee82d3321551692c4a871493 - firebase_messaging: 15d8b557010f3bb7b98d0302e1c7c8fbcd244425 - FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 + Firebase: cf1b19f21410b029b6786a54e9764a0cacad3c99 + firebase_core: b62a5080210edad3f2934314a8b2c6f5124e8e10 + firebase_messaging: 98619a0572d82cfb3668e78859ba9f1110e268c9 + FirebaseCore: e0510f1523bc0eb21653cac00792e1e2bd6f1771 FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2 FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414 - FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742 + FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d @@ -234,7 +234,7 @@ SPEC CHECKSUMS: path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 - share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad + share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f sqlite3: 7559e33dae4c78538df563795af3a86fc887ee71 sqlite3_flutter_libs: 58ae36c0dd086395d066b4fe4de9cdca83e717b3 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 diff --git a/lib/model/database.g.dart b/lib/model/database.g.dart index 9285a8abae..f2471d1e2f 100644 --- a/lib/model/database.g.dart +++ b/lib/model/database.g.dart @@ -535,22 +535,148 @@ typedef $$AccountsTableUpdateCompanionBuilder = AccountsCompanion Function({ Value ackedPushToken, }); +class $$AccountsTableFilterComposer + extends Composer<_$AppDatabase, $AccountsTable> { + $$AccountsTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnWithTypeConverterFilters get realmUrl => + $composableBuilder( + column: $table.realmUrl, + builder: (column) => ColumnWithTypeConverterFilters(column)); + + ColumnFilters get userId => $composableBuilder( + column: $table.userId, builder: (column) => ColumnFilters(column)); + + ColumnFilters get email => $composableBuilder( + column: $table.email, builder: (column) => ColumnFilters(column)); + + ColumnFilters get apiKey => $composableBuilder( + column: $table.apiKey, builder: (column) => ColumnFilters(column)); + + ColumnFilters get zulipVersion => $composableBuilder( + column: $table.zulipVersion, builder: (column) => ColumnFilters(column)); + + ColumnFilters get zulipMergeBase => $composableBuilder( + column: $table.zulipMergeBase, + builder: (column) => ColumnFilters(column)); + + ColumnFilters get zulipFeatureLevel => $composableBuilder( + column: $table.zulipFeatureLevel, + builder: (column) => ColumnFilters(column)); + + ColumnFilters get ackedPushToken => $composableBuilder( + column: $table.ackedPushToken, + builder: (column) => ColumnFilters(column)); +} + +class $$AccountsTableOrderingComposer + extends Composer<_$AppDatabase, $AccountsTable> { + $$AccountsTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get realmUrl => $composableBuilder( + column: $table.realmUrl, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get userId => $composableBuilder( + column: $table.userId, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get email => $composableBuilder( + column: $table.email, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get apiKey => $composableBuilder( + column: $table.apiKey, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get zulipVersion => $composableBuilder( + column: $table.zulipVersion, + builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get zulipMergeBase => $composableBuilder( + column: $table.zulipMergeBase, + builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get zulipFeatureLevel => $composableBuilder( + column: $table.zulipFeatureLevel, + builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get ackedPushToken => $composableBuilder( + column: $table.ackedPushToken, + builder: (column) => ColumnOrderings(column)); +} + +class $$AccountsTableAnnotationComposer + extends Composer<_$AppDatabase, $AccountsTable> { + $$AccountsTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumnWithTypeConverter get realmUrl => + $composableBuilder(column: $table.realmUrl, builder: (column) => column); + + GeneratedColumn get userId => + $composableBuilder(column: $table.userId, builder: (column) => column); + + GeneratedColumn get email => + $composableBuilder(column: $table.email, builder: (column) => column); + + GeneratedColumn get apiKey => + $composableBuilder(column: $table.apiKey, builder: (column) => column); + + GeneratedColumn get zulipVersion => $composableBuilder( + column: $table.zulipVersion, builder: (column) => column); + + GeneratedColumn get zulipMergeBase => $composableBuilder( + column: $table.zulipMergeBase, builder: (column) => column); + + GeneratedColumn get zulipFeatureLevel => $composableBuilder( + column: $table.zulipFeatureLevel, builder: (column) => column); + + GeneratedColumn get ackedPushToken => $composableBuilder( + column: $table.ackedPushToken, builder: (column) => column); +} + class $$AccountsTableTableManager extends RootTableManager< _$AppDatabase, $AccountsTable, Account, $$AccountsTableFilterComposer, $$AccountsTableOrderingComposer, + $$AccountsTableAnnotationComposer, $$AccountsTableCreateCompanionBuilder, - $$AccountsTableUpdateCompanionBuilder> { + $$AccountsTableUpdateCompanionBuilder, + (Account, BaseReferences<_$AppDatabase, $AccountsTable, Account>), + Account, + PrefetchHooks Function()> { $$AccountsTableTableManager(_$AppDatabase db, $AccountsTable table) : super(TableManagerState( db: db, table: table, - filteringComposer: - $$AccountsTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$AccountsTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$AccountsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$AccountsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$AccountsTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value realmUrl = const Value.absent(), @@ -595,108 +721,25 @@ class $$AccountsTableTableManager extends RootTableManager< zulipFeatureLevel: zulipFeatureLevel, ackedPushToken: ackedPushToken, ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, )); } -class $$AccountsTableFilterComposer - extends FilterComposer<_$AppDatabase, $AccountsTable> { - $$AccountsTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnWithTypeConverterFilters get realmUrl => - $state.composableBuilder( - column: $state.table.realmUrl, - builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( - column, - joinBuilders: joinBuilders)); - - ColumnFilters get userId => $state.composableBuilder( - column: $state.table.userId, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get email => $state.composableBuilder( - column: $state.table.email, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get apiKey => $state.composableBuilder( - column: $state.table.apiKey, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get zulipVersion => $state.composableBuilder( - column: $state.table.zulipVersion, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get zulipMergeBase => $state.composableBuilder( - column: $state.table.zulipMergeBase, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get zulipFeatureLevel => $state.composableBuilder( - column: $state.table.zulipFeatureLevel, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get ackedPushToken => $state.composableBuilder( - column: $state.table.ackedPushToken, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); -} - -class $$AccountsTableOrderingComposer - extends OrderingComposer<_$AppDatabase, $AccountsTable> { - $$AccountsTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get realmUrl => $state.composableBuilder( - column: $state.table.realmUrl, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get userId => $state.composableBuilder( - column: $state.table.userId, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get email => $state.composableBuilder( - column: $state.table.email, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get apiKey => $state.composableBuilder( - column: $state.table.apiKey, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get zulipVersion => $state.composableBuilder( - column: $state.table.zulipVersion, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get zulipMergeBase => $state.composableBuilder( - column: $state.table.zulipMergeBase, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get zulipFeatureLevel => $state.composableBuilder( - column: $state.table.zulipFeatureLevel, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get ackedPushToken => $state.composableBuilder( - column: $state.table.ackedPushToken, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); -} +typedef $$AccountsTableProcessedTableManager = ProcessedTableManager< + _$AppDatabase, + $AccountsTable, + Account, + $$AccountsTableFilterComposer, + $$AccountsTableOrderingComposer, + $$AccountsTableAnnotationComposer, + $$AccountsTableCreateCompanionBuilder, + $$AccountsTableUpdateCompanionBuilder, + (Account, BaseReferences<_$AppDatabase, $AccountsTable, Account>), + Account, + PrefetchHooks Function()>; class $AppDatabaseManager { final _$AppDatabase _db; diff --git a/macos/Podfile.lock b/macos/Podfile.lock index fa33500c03..8c7b011db1 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -3,21 +3,21 @@ PODS: - FlutterMacOS - file_selector_macos (0.0.1): - FlutterMacOS - - Firebase/CoreOnly (11.0.0): - - FirebaseCore (= 11.0.0) - - Firebase/Messaging (11.0.0): + - Firebase/CoreOnly (11.4.2): + - FirebaseCore (= 11.4.2) + - Firebase/Messaging (11.4.2): - Firebase/CoreOnly - - FirebaseMessaging (~> 11.0.0) - - firebase_core (3.4.0): - - Firebase/CoreOnly (~> 11.0.0) + - FirebaseMessaging (~> 11.4.0) + - firebase_core (3.9.0): + - Firebase/CoreOnly (~> 11.4.0) - FlutterMacOS - - firebase_messaging (15.1.0): - - Firebase/CoreOnly (~> 11.0.0) - - Firebase/Messaging (~> 11.0.0) + - firebase_messaging (15.1.6): + - Firebase/CoreOnly (~> 11.4.0) + - Firebase/Messaging (~> 11.4.0) - firebase_core - FlutterMacOS - - FirebaseCore (11.0.0): - - FirebaseCoreInternal (~> 11.0) + - FirebaseCore (11.4.2): + - FirebaseCoreInternal (< 12.0, >= 11.4.2) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - FirebaseCoreInternal (11.6.0): @@ -27,7 +27,7 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.0.0): + - FirebaseMessaging (11.4.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) @@ -160,13 +160,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720 file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d - Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9 - firebase_core: ca9bcfb9835e1bcd5ff205e24a541f6bc04e7a35 - firebase_messaging: c834894f659ce965ba4f93fe5d0dc5d705a3cc88 - FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 + Firebase: 7fd5466678d964be78fbf536d8a3385da19c4828 + firebase_core: 1dfe1f4d02ad78be0277e320aa3d8384cf46231f + firebase_messaging: 61f678060b69a7ae1013e3a939ec8e1c56ef6fcf + FirebaseCore: 6b32c57269bd999aab34354c3923d92a6e5f3f84 FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2 FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414 - FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742 + FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d @@ -174,7 +174,7 @@ SPEC CHECKSUMS: package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf + share_plus: 1fa619de8392a4398bfaf176d441853922614e89 sqlite3: 7559e33dae4c78538df563795af3a86fc887ee71 sqlite3_flutter_libs: 58ae36c0dd086395d066b4fe4de9cdca83e717b3 url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404 diff --git a/pubspec.lock b/pubspec.lock index 09b51b47b3..e98a6a5339 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "9371d13b8ee442e3bfc08a24e3a1b3742c839abbfaf5eef11b79c4b862c89bf7" + sha256: daa1d780fdecf8af925680c06c86563cdd445deea995d5c9176f1302a2b10bbe url: "https://pub.dev" source: hosted - version: "1.3.41" + version: "1.3.48" _macros: dependency: transitive description: dart @@ -283,18 +283,18 @@ packages: dependency: "direct main" description: name: drift - sha256: "4e0ffee40d23f0b809e6cff1ad202886f51d629649073ed42d9cd1d194ea943e" + sha256: c2d073d35ad441730812f4ea05b5dd031fb81c5f9786a4f5fb77ecd6307b6f74 url: "https://pub.dev" source: hosted - version: "2.19.1+1" + version: "2.22.1" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: ac7647c6cedca99724ca300cff9181f6dd799428f8ed71f94159ed0528eaec26 + sha256: f4ab5d6976b1e31551ceb82ff597a505bda7818ff4f7be08a1da9d55eb6e730c url: "https://pub.dev" source: hosted - version: "2.19.1" + version: "2.22.1" fake_async: dependency: "direct dev" description: @@ -323,10 +323,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3" + sha256: c2376a6aae82358a9f9ccdd7d1f4006d08faa39a2767cce01031d9f593a8bd3b url: "https://pub.dev" source: hosted - version: "8.0.7" + version: "8.1.6" file_selector_linux: dependency: transitive description: @@ -363,10 +363,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: "06537da27db981947fa535bb91ca120b4e9cb59cb87278dbdde718558cafc9ff" + sha256: "15d761b95dfa2906dfcc31b7fc6fe293188533d1a3ffe78389ba9e69bd7fdbde" url: "https://pub.dev" source: hosted - version: "3.4.0" + version: "3.9.0" firebase_core_platform_interface: dependency: transitive description: @@ -379,34 +379,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "362e52457ed2b7b180964769c1e04d1e0ea0259fdf7025fdfedd019d4ae2bd88" + sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b url: "https://pub.dev" source: hosted - version: "2.17.5" + version: "2.19.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "29941ba5a3204d80656c0e52103369aa9a53edfd9ceae05a2bb3376f24fda453" + sha256: "151a3ee68736abf293aab66d1317ade53c88abe1db09c75a0460aebf7767bbdf" url: "https://pub.dev" source: hosted - version: "15.1.0" + version: "15.1.6" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "26c5370d3a79b15c8032724a68a4741e28f63e1f1a45699c4f0a8ae740aadd72" + sha256: f331ee51e40c243f90cc7bc059222dfec4e5df53125b08d31fb28961b00d2a9d url: "https://pub.dev" source: hosted - version: "4.5.43" + version: "4.5.49" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "58276cd5d9e22a9320ef9e5bc358628920f770f93c91221f8b638e8346ed5df4" + sha256: efaf3fdc54cd77e0eedb8e75f7f01c808828c64d052ddbf94d3009974e47d30f url: "https://pub.dev" source: hosted - version: "3.8.13" + version: "3.9.5" fixnum: dependency: transitive description: @@ -919,18 +919,18 @@ packages: dependency: "direct main" description: name: share_plus - sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544 + sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400" url: "https://pub.dev" source: hosted - version: "9.0.0" + version: "10.1.3" share_plus_platform_interface: dependency: "direct main" description: name: share_plus_platform_interface - sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4" + sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.2" shelf: dependency: transitive description: @@ -1020,10 +1020,10 @@ packages: dependency: "direct main" description: name: sqlite3 - sha256: fde692580bee3379374af1f624eb3e113ab2865ecb161dbe2d8ac2de9735dbdb + sha256: cb7f4e9dc1b52b1fa350f7b3d41c662e75fc3d399555fa4e5efcf267e9a4fbb5 url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.5.0" sqlite3_flutter_libs: dependency: "direct main" description: @@ -1036,10 +1036,10 @@ packages: dependency: transitive description: name: sqlparser - sha256: "3be52b4968fc2f098ba735863404756d2fe3ea0729cf006a5b5612618f74ca04" + sha256: "4cad4b2c5f63dc9ea1a8dcffb58cf762322bea5dd8836870164a65e913bdae41" url: "https://pub.dev" source: hosted - version: "0.37.1" + version: "0.40.0" stack_trace: dependency: "direct dev" description: @@ -1284,10 +1284,10 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" web_socket: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 3c177ca56b..c81b52a367 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,8 +54,8 @@ dependencies: package_info_plus: ^8.0.0 path: ^1.8.3 path_provider: ^2.0.13 - share_plus: ^9.0.0 - share_plus_platform_interface: ^4.0.0 + share_plus: ^10.1.3 + share_plus_platform_interface: ^5.0.2 sqlite3: ^2.4.0 sqlite3_flutter_libs: ^0.5.13 url_launcher: ^6.1.11 diff --git a/test/model/database_test.dart b/test/model/database_test.dart index 5194e45f8c..cb3a7d299b 100644 --- a/test/model/database_test.dart +++ b/test/model/database_test.dart @@ -1,7 +1,7 @@ import 'package:checks/checks.dart'; import 'package:drift/drift.dart'; import 'package:drift/native.dart'; -import 'package:drift_dev/api/migrations.dart'; +import 'package:drift_dev/api/migrations_native.dart'; import 'package:test/scaffolding.dart'; import 'package:zulip/model/database.dart'; diff --git a/test/model/schemas/drift_schema_v2.json b/test/model/schemas/drift_schema_v2.json index 270e1f359a..429b959260 100644 --- a/test/model/schemas/drift_schema_v2.json +++ b/test/model/schemas/drift_schema_v2.json @@ -1 +1 @@ -{"_meta":{"description":"This file contains a serialized version of schema entities for drift.","version":"1.1.0"},"options":{"store_date_time_values_as_text":false},"entities":[{"id":0,"references":[],"type":"table","data":{"name":"accounts","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"int","nullable":false,"customConstraints":null,"defaultConstraints":"PRIMARY KEY AUTOINCREMENT","default_dart":null,"default_client_dart":null,"dsl_features":["auto-increment"]},{"name":"realm_url","getter_name":"realmUrl","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const UriConverter()","dart_type_name":"Uri"}},{"name":"user_id","getter_name":"userId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"api_key","getter_name":"apiKey","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"zulip_version","getter_name":"zulipVersion","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"zulip_merge_base","getter_name":"zulipMergeBase","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"zulip_feature_level","getter_name":"zulipFeatureLevel","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"acked_push_token","getter_name":"ackedPushToken","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"unique_keys":[["realm_url","user_id"],["realm_url","email"]]}}]} \ No newline at end of file +{"_meta":{"description":"This file contains a serialized version of schema entities for drift.","version":"1.2.0"},"options":{"store_date_time_values_as_text":false},"entities":[{"id":0,"references":[],"type":"table","data":{"name":"accounts","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"int","nullable":false,"customConstraints":null,"defaultConstraints":"PRIMARY KEY AUTOINCREMENT","dialectAwareDefaultConstraints":{"sqlite":"PRIMARY KEY AUTOINCREMENT"},"default_dart":null,"default_client_dart":null,"dsl_features":["auto-increment"]},{"name":"realm_url","getter_name":"realmUrl","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const UriConverter()","dart_type_name":"Uri"}},{"name":"user_id","getter_name":"userId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"api_key","getter_name":"apiKey","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"zulip_version","getter_name":"zulipVersion","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"zulip_merge_base","getter_name":"zulipMergeBase","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"zulip_feature_level","getter_name":"zulipFeatureLevel","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"acked_push_token","getter_name":"ackedPushToken","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"unique_keys":[["realm_url","user_id"],["realm_url","email"]]}}]} \ No newline at end of file diff --git a/test/model/schemas/schema.dart b/test/model/schemas/schema.dart index c8c6ff5926..b2b7404b5a 100644 --- a/test/model/schemas/schema.dart +++ b/test/model/schemas/schema.dart @@ -1,6 +1,6 @@ +// dart format width=80 // GENERATED CODE, DO NOT EDIT BY HAND. // ignore_for_file: type=lint -//@dart=2.12 import 'package:drift/drift.dart'; import 'package:drift/internal/migrations.dart'; import 'schema_v1.dart' as v1; @@ -15,7 +15,9 @@ class GeneratedHelper implements SchemaInstantiationHelper { case 2: return v2.DatabaseAtV2(db); default: - throw MissingSchemaException(version, const {1, 2}); + throw MissingSchemaException(version, versions); } } + + static const versions = const [1, 2]; } diff --git a/test/model/schemas/schema_v1.dart b/test/model/schemas/schema_v1.dart index d96f46df61..497a491bc6 100644 --- a/test/model/schemas/schema_v1.dart +++ b/test/model/schemas/schema_v1.dart @@ -1,6 +1,6 @@ +// dart format width=80 // GENERATED CODE, DO NOT EDIT BY HAND. // ignore_for_file: type=lint -//@dart=2.12 import 'package:drift/drift.dart'; class Accounts extends Table with TableInfo { diff --git a/test/model/schemas/schema_v2.dart b/test/model/schemas/schema_v2.dart index 377f3b2661..863ee8d36d 100644 --- a/test/model/schemas/schema_v2.dart +++ b/test/model/schemas/schema_v2.dart @@ -1,6 +1,6 @@ +// dart format width=80 // GENERATED CODE, DO NOT EDIT BY HAND. // ignore_for_file: type=lint -//@dart=2.12 import 'package:drift/drift.dart'; class Accounts extends Table with TableInfo {