From 8761e987b6167ac495656112c963c819d20f56de Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 14:45:01 +0700 Subject: [PATCH 01/14] Upgrade collection to 1.17.1 --- core/pubspec.lock | 34 +++++++++++++++++----------------- core/pubspec.yaml | 3 +-- model/pubspec.lock | 34 +++++++++++++++++----------------- model/pubspec.yaml | 3 +-- pubspec.yaml | 3 +-- 5 files changed, 37 insertions(+), 40 deletions(-) diff --git a/core/pubspec.lock b/core/pubspec.lock index 4aa93a9a83..2cd935edc5 100644 --- a/core/pubspec.lock +++ b/core/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" charcode: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: "direct main" description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" csslib: dependency: transitive description: @@ -316,10 +316,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" lints: dependency: transitive description: @@ -332,10 +332,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -348,18 +348,18 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_parsing: dependency: transitive description: @@ -505,10 +505,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" typed_data: dependency: transitive description: @@ -654,5 +654,5 @@ packages: source: hosted version: "6.2.2" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.7.0" diff --git a/core/pubspec.yaml b/core/pubspec.yaml index d4e4551df6..032fe39a2e 100644 --- a/core/pubspec.yaml +++ b/core/pubspec.yaml @@ -67,8 +67,7 @@ dependencies: path_provider_platform_interface: 2.0.1 - # flutter_test from sdk depends on collection 1.17.0 - collection: 1.17.0 + collection: 1.17.1 # flutter_localizations depends on intl 0.17.0 intl: 0.17.0 diff --git a/model/pubspec.lock b/model/pubspec.lock index 133620eabc..8d529dfeb5 100644 --- a/model/pubspec.lock +++ b/model/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" charcode: dependency: transitive description: @@ -149,10 +149,10 @@ packages: dependency: "direct main" description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" convert: dependency: transitive description: @@ -492,10 +492,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: "direct main" description: @@ -532,10 +532,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -548,10 +548,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: "direct main" description: @@ -572,10 +572,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_parsing: dependency: transitive description: @@ -793,10 +793,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" timing: dependency: transitive description: @@ -982,5 +982,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.7.0" diff --git a/model/pubspec.yaml b/model/pubspec.yaml index 12ed8344a7..44ab4dcb90 100644 --- a/model/pubspec.yaml +++ b/model/pubspec.yaml @@ -53,8 +53,7 @@ dependencies: mime: 1.0.4 - # flutter_test from sdk depends on collection 1.17.0 - collection: 1.17.0 + collection: 1.17.1 dartz: 0.10.1 diff --git a/pubspec.yaml b/pubspec.yaml index 41d834b92e..37176619a0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -106,8 +106,7 @@ dependencies: http_parser: 4.0.2 - # flutter_test from sdk depends on collection 1.17.0 - collection: 1.17.0 + collection: 1.17.1 filesize: 2.0.1 From 4dbdd4bced9f1e332992b96d93358d1cdcb25de0 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 14:46:54 +0700 Subject: [PATCH 02/14] Upgrade mockito to 5.4.2 --- contact/pubspec.lock | 50 ++++++++++++++++++++-------------------- contact/pubspec.yaml | 2 +- fcm/pubspec.lock | 50 ++++++++++++++++++++-------------------- fcm/pubspec.yaml | 2 +- forward/pubspec.lock | 50 ++++++++++++++++++++-------------------- forward/pubspec.yaml | 2 +- pubspec.yaml | 2 +- rule_filter/pubspec.lock | 50 ++++++++++++++++++++-------------------- rule_filter/pubspec.yaml | 2 +- 9 files changed, 105 insertions(+), 105 deletions(-) diff --git a/contact/pubspec.lock b/contact/pubspec.lock index f7d16f0fb9..c9614df492 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: a36ec4843dc30ea6bf652bf25e3448db6c5e8bcf4aa55f063a5d1dad216d8214 + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "58.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: cc4242565347e98424ce9945c819c192ec0838cb9d1f6aa4a97cc96becbc5b27 + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.13.0" args: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" charcode: dependency: transitive description: @@ -141,18 +141,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" collection: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" convert: dependency: transitive description: @@ -500,10 +500,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: "direct main" description: @@ -540,10 +540,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -556,10 +556,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -572,10 +572,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "2a8a17b82b1bde04d514e75d90d634a0ac23f6cb4991f6098009dd56836aeafe" + sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" url: "https://pub.dev" source: hosted - version: "5.3.2" + version: "5.4.2" model: dependency: "direct main" description: @@ -595,10 +595,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_parsing: dependency: transitive description: @@ -816,10 +816,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" timing: dependency: transitive description: @@ -1005,5 +1005,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.7.0" diff --git a/contact/pubspec.yaml b/contact/pubspec.yaml index a48f835475..ff87412965 100644 --- a/contact/pubspec.yaml +++ b/contact/pubspec.yaml @@ -39,7 +39,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.3.2 + mockito: 5.4.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/fcm/pubspec.lock b/fcm/pubspec.lock index 1273272758..95f1da2e60 100644 --- a/fcm/pubspec.lock +++ b/fcm/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: a36ec4843dc30ea6bf652bf25e3448db6c5e8bcf4aa55f063a5d1dad216d8214 + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "58.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: cc4242565347e98424ce9945c819c192ec0838cb9d1f6aa4a97cc96becbc5b27 + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.13.0" args: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" checked_yaml: dependency: transitive description: @@ -133,18 +133,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" collection: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" convert: dependency: transitive description: @@ -304,10 +304,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: "direct main" description: @@ -344,10 +344,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -360,10 +360,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -376,10 +376,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "2a8a17b82b1bde04d514e75d90d634a0ac23f6cb4991f6098009dd56836aeafe" + sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" url: "https://pub.dev" source: hosted - version: "5.3.2" + version: "5.4.2" package_config: dependency: transitive description: @@ -392,10 +392,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" pool: dependency: transitive description: @@ -517,10 +517,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" timing: dependency: transitive description: @@ -570,5 +570,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.0.0" diff --git a/fcm/pubspec.yaml b/fcm/pubspec.yaml index 96917c00f3..42df06ce1e 100644 --- a/fcm/pubspec.yaml +++ b/fcm/pubspec.yaml @@ -36,7 +36,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.3.2 + mockito: 5.4.2 flutter: diff --git a/forward/pubspec.lock b/forward/pubspec.lock index 1273272758..95f1da2e60 100644 --- a/forward/pubspec.lock +++ b/forward/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: a36ec4843dc30ea6bf652bf25e3448db6c5e8bcf4aa55f063a5d1dad216d8214 + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "58.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: cc4242565347e98424ce9945c819c192ec0838cb9d1f6aa4a97cc96becbc5b27 + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.13.0" args: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" checked_yaml: dependency: transitive description: @@ -133,18 +133,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" collection: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" convert: dependency: transitive description: @@ -304,10 +304,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: "direct main" description: @@ -344,10 +344,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -360,10 +360,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -376,10 +376,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "2a8a17b82b1bde04d514e75d90d634a0ac23f6cb4991f6098009dd56836aeafe" + sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" url: "https://pub.dev" source: hosted - version: "5.3.2" + version: "5.4.2" package_config: dependency: transitive description: @@ -392,10 +392,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" pool: dependency: transitive description: @@ -517,10 +517,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" timing: dependency: transitive description: @@ -570,5 +570,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.0.0" diff --git a/forward/pubspec.yaml b/forward/pubspec.yaml index 8d6d810ae5..bc8ccdcd35 100644 --- a/forward/pubspec.yaml +++ b/forward/pubspec.yaml @@ -36,7 +36,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.3.2 + mockito: 5.4.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/pubspec.yaml b/pubspec.yaml index 37176619a0..6bd9aba147 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -208,7 +208,7 @@ dev_dependencies: build_runner: 2.3.3 - mockito: 5.3.2 + mockito: 5.4.2 hive_generator: 2.0.0 diff --git a/rule_filter/pubspec.lock b/rule_filter/pubspec.lock index 1273272758..95f1da2e60 100644 --- a/rule_filter/pubspec.lock +++ b/rule_filter/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: a36ec4843dc30ea6bf652bf25e3448db6c5e8bcf4aa55f063a5d1dad216d8214 + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "58.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: cc4242565347e98424ce9945c819c192ec0838cb9d1f6aa4a97cc96becbc5b27 + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.13.0" args: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" checked_yaml: dependency: transitive description: @@ -133,18 +133,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" collection: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" convert: dependency: transitive description: @@ -304,10 +304,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: "direct main" description: @@ -344,10 +344,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -360,10 +360,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -376,10 +376,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "2a8a17b82b1bde04d514e75d90d634a0ac23f6cb4991f6098009dd56836aeafe" + sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" url: "https://pub.dev" source: hosted - version: "5.3.2" + version: "5.4.2" package_config: dependency: transitive description: @@ -392,10 +392,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" pool: dependency: transitive description: @@ -517,10 +517,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" timing: dependency: transitive description: @@ -570,5 +570,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.0.0" diff --git a/rule_filter/pubspec.yaml b/rule_filter/pubspec.yaml index 4eac8024c4..7c90a5c3db 100644 --- a/rule_filter/pubspec.yaml +++ b/rule_filter/pubspec.yaml @@ -36,7 +36,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.3.2 + mockito: 5.4.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From 053330ba842efd00eada8ed6ed29a37d1200a246 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 14:47:33 +0700 Subject: [PATCH 03/14] Upgrade async to 2.11.0 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 6bd9aba147..b9517de09c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -155,7 +155,7 @@ dependencies: worker_manager: 5.0.3 - async: 2.10.0 + async: 2.11.0 html: 0.15.1 From dce1853947b4adad223bb449c6810ea652fe5663 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 14:53:27 +0700 Subject: [PATCH 04/14] Upgrade intl to 0.18.0 --- contact/pubspec.lock | 4 ++-- core/pubspec.lock | 4 ++-- core/pubspec.yaml | 3 +-- model/pubspec.lock | 4 ++-- model/pubspec.yaml | 3 +-- pubspec.yaml | 3 +-- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/contact/pubspec.lock b/contact/pubspec.lock index c9614df492..15ab2b2030 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -475,10 +475,10 @@ packages: dependency: transitive description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" io: dependency: transitive description: diff --git a/core/pubspec.lock b/core/pubspec.lock index 2cd935edc5..ae5dadcafb 100644 --- a/core/pubspec.lock +++ b/core/pubspec.lock @@ -308,10 +308,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" js: dependency: transitive description: diff --git a/core/pubspec.yaml b/core/pubspec.yaml index 032fe39a2e..f9c18c9b81 100644 --- a/core/pubspec.yaml +++ b/core/pubspec.yaml @@ -69,8 +69,7 @@ dependencies: collection: 1.17.1 - # flutter_localizations depends on intl 0.17.0 - intl: 0.17.0 + intl: 0.18.0 flutter_typeahead: 4.6.0 diff --git a/model/pubspec.lock b/model/pubspec.lock index 8d529dfeb5..7b6bab6d0e 100644 --- a/model/pubspec.lock +++ b/model/pubspec.lock @@ -467,10 +467,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" io: dependency: transitive description: diff --git a/model/pubspec.yaml b/model/pubspec.yaml index 44ab4dcb90..4ce15a4b8c 100644 --- a/model/pubspec.yaml +++ b/model/pubspec.yaml @@ -42,8 +42,7 @@ dependencies: quiver: 3.2.1 - # flutter_localizations depends on intl 0.17.0 - intl: 0.17.0 + intl: 0.18.0 uri: 1.0.0 diff --git a/pubspec.yaml b/pubspec.yaml index b9517de09c..5e880de60b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -185,8 +185,7 @@ dependencies: flutter_appauth_platform_interface: 5.2.0 - # flutter_localizations depends on intl 0.17.0 - intl: 0.17.0 + intl: 0.18.0 super_tag_editor: 0.1.3 From 1a26e0c1300a5fcbd30029caa9ff2c0310caf768 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 14:56:04 +0700 Subject: [PATCH 05/14] Upgrade super_tag_editor --- pubspec.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 5e880de60b..093f74f086 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -81,6 +81,11 @@ dependencies: url: https://github.com/linagora/flutter-date-range-picker.git ref: master + super_tag_editor: + git: + url: https://github.com/dab246/super_tag_editor.git + ref: upgrade_v3.10.6 + ### Dependencies from pub.dev ### cupertino_icons: 1.0.5 @@ -187,8 +192,6 @@ dependencies: intl: 0.18.0 - super_tag_editor: 0.1.3 - external_app_launcher: 3.1.0 workmanager: 0.5.1 From ac490e5e016ace8d8dcde0c172489d208b64d985 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 14:57:15 +0700 Subject: [PATCH 06/14] Upgrade timeago to 3.5.0 --- pubspec.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 093f74f086..e36dbb0583 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -149,8 +149,7 @@ dependencies: flutter_portal: 1.1.3 - # flutter_localizations depends on intl 0.17.0 - timeago: 3.3.0 + timeago: 3.5.0 better_open_file: 3.6.4 From 7cbf5279272c6ea7e7fda6a0920c5ca7a8fd245e Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 15:05:01 +0700 Subject: [PATCH 07/14] Upgrade flutter_date_range_picker --- pubspec.lock | 75 ++++++++++++++++++++++++++-------------------------- pubspec.yaml | 2 +- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index fb2e693b82..7b656d487f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: a36ec4843dc30ea6bf652bf25e3448db6c5e8bcf4aa55f063a5d1dad216d8214 + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "58.0.0" + version: "61.0.0" _flutterfire_internals: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: analyzer - sha256: cc4242565347e98424ce9945c819c192ec0838cb9d1f6aa4a97cc96becbc5b27 + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.13.0" archive: dependency: transitive description: @@ -45,10 +45,10 @@ packages: dependency: "direct main" description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" better_open_file: dependency: "direct main" description: @@ -141,10 +141,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" charcode: dependency: transitive description: @@ -181,18 +181,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" collection: dependency: "direct main" description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" connectivity_plus: dependency: "direct main" description: @@ -602,8 +602,8 @@ packages: dependency: "direct main" description: path: "." - ref: master - resolved-ref: "609fce1ac4d877d74290728711a1e3629e29ed3c" + ref: "upgrade_v3.10.6" + resolved-ref: a3b41a21e18cd0884a834c45c51d751fae391f36 url: "https://github.com/linagora/flutter-date-range-picker.git" source: git version: "1.0.2" @@ -946,10 +946,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" intl_generator: dependency: "direct main" description: @@ -979,10 +979,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: "direct main" description: @@ -1019,10 +1019,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -1035,10 +1035,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -1051,10 +1051,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "2a8a17b82b1bde04d514e75d90d634a0ac23f6cb4991f6098009dd56836aeafe" + sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" url: "https://pub.dev" source: hosted - version: "5.3.2" + version: "5.4.2" model: dependency: "direct main" description: @@ -1106,10 +1106,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_parsing: dependency: transitive description: @@ -1170,10 +1170,10 @@ packages: dependency: transitive description: name: pattern_formatter - sha256: c488f1d1e3bbb0b90ec21abd50a891feb89857c4755cdcd81a75525e89c78121 + sha256: "987d24df31179325897f58258132492e86de577c6ae50c8102b9a1342f607688" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" percent_indicator: dependency: "direct main" description: @@ -1495,10 +1495,11 @@ packages: super_tag_editor: dependency: "direct main" description: - name: super_tag_editor - sha256: "1dc68f2cff2e516c76f3d8a5e9b6cfbe3e4969952e07553356696f8738e2e0bd" - url: "https://pub.dev" - source: hosted + path: "." + ref: "upgrade_v3.10.6" + resolved-ref: "08a743cd37fd3d8cce072bd278f7d8132fe95ed1" + url: "https://github.com/dab246/super_tag_editor.git" + source: git version: "0.1.3" syncfusion_flutter_core: dependency: transitive @@ -1528,10 +1529,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" textfield_tags: dependency: "direct main" description: @@ -1544,10 +1545,10 @@ packages: dependency: "direct main" description: name: timeago - sha256: "46c128312ab0ea144b146c0ac6426ddd96810efec2de3fccc425d00179cd8254" + sha256: "4addcda362e51f23cf7ae2357fccd053f29d59b4ddd17fb07fc3e7febb47a456" url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.5.0" timezone: dependency: transitive description: @@ -1773,5 +1774,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.7.0" diff --git a/pubspec.yaml b/pubspec.yaml index e36dbb0583..c810290754 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -79,7 +79,7 @@ dependencies: flutter_date_range_picker: git: url: https://github.com/linagora/flutter-date-range-picker.git - ref: master + ref: upgrade_v3.10.6 super_tag_editor: git: From 5874bb459bd87aa1685c368f15f9ace24090b8f0 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 15:08:56 +0700 Subject: [PATCH 08/14] Fix conflict class name --- .../presentation/controller/advanced_filter_controller.dart | 4 ++-- .../presentation/controller/mailbox_dashboard_controller.dart | 4 ++-- .../presentation/mailbox_dashboard_view_web.dart | 4 ++-- .../advanced_search/icon_open_advanced_search_widget.dart | 4 ++-- lib/features/thread/presentation/thread_controller.dart | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart index 0de149beae..ba60e2bc02 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart @@ -19,7 +19,7 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_action import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/input_field_focus_manager.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart'; -import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart' as search; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/extensions/datetime_extension.dart'; @@ -46,7 +46,7 @@ class AdvancedFilterController extends BaseController { TextEditingController mailBoxFilterInputController = TextEditingController(); ContactSuggestionSource _contactSuggestionSource = ContactSuggestionSource.tMailContact; - final SearchController searchController = Get.find(); + final search.SearchController searchController = Get.find(); final MailboxDashBoardController _mailboxDashBoardController = Get.find(); SearchEmailFilter get searchEmailFilter => diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart index e1b29772df..02f406260a 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart @@ -65,7 +65,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/das import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/app_grid_dashboard_controller.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/download/download_controller.dart'; -import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart' as search; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/set_error_extension.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart'; @@ -137,7 +137,7 @@ class MailboxDashBoardController extends ReloadableController { final RemoveEmailDraftsInteractor _removeEmailDraftsInteractor = Get.find(); final ResponsiveUtils _responsiveUtils = Get.find(); final EmailReceiveManager _emailReceiveManager = Get.find(); - final SearchController searchController = Get.find(); + final search.SearchController searchController = Get.find(); final DownloadController downloadController = Get.find(); final AppGridDashboardController appGridDashboardController = Get.find(); final SpamReportController spamReportController = Get.find(); diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart index 611cd08070..99d8abe97c 100644 --- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart +++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart @@ -13,7 +13,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/das import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/app_grid_dashboard_controller.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart'; -import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart' as search; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart'; @@ -41,7 +41,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView { MailboxDashBoardView({Key? key}) : super(key: key); - final SearchController searchController = Get.find(); + final search.SearchController searchController = Get.find(); final AppGridDashboardController appGridDashboardController = Get.find(); final mailBoxDashboardController = Get.find(); final SpamReportController spamReportController = Get.find(); diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/icon_open_advanced_search_widget.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/icon_open_advanced_search_widget.dart index 6a1f8b9916..3b08d0fc20 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/icon_open_advanced_search_widget.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/icon_open_advanced_search_widget.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart'; -import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart' as search; import 'package:tmail_ui_user/main/utils/app_utils.dart'; class IconOpenAdvancedSearchWidget extends StatelessWidget { @@ -16,7 +16,7 @@ class IconOpenAdvancedSearchWidget extends StatelessWidget { }) : super(key: key); final _imagePaths = Get.find(); - final SearchController searchController = Get.find(); + final search.SearchController searchController = Get.find(); final AdvancedFilterController advancedFilterController = Get.find(); final BuildContext _parentContext; diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart index 4e350e24d4..8a4741e5a6 100644 --- a/lib/features/thread/presentation/thread_controller.dart +++ b/lib/features/thread/presentation/thread_controller.dart @@ -33,7 +33,7 @@ import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read_state.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart'; -import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart' as search; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart'; import 'package:tmail_ui_user/features/network_connection/presentation/network_connection_controller.dart'; @@ -110,7 +110,7 @@ class ThreadController extends BaseController with EmailActionController { PresentationMailbox? get currentMailbox => mailboxDashBoardController.selectedMailbox.value; - SearchController get searchController => mailboxDashBoardController.searchController; + search.SearchController get searchController => mailboxDashBoardController.searchController; SearchEmailFilter get _searchEmailFilter => searchController.searchEmailFilter.value; From 3be0933d3ddf2933716485b476ce7986c8a85a30 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 16:34:02 +0700 Subject: [PATCH 09/14] Upgrade extended_text to 11.0.1 --- pubspec.lock | 10 +++++----- pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 7b656d487f..4c6386f99f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -389,18 +389,18 @@ packages: dependency: "direct main" description: name: extended_text - sha256: "3f555a60f63ff51d5080f5eed89e65bc18f17b69e01f4e16cadfd0cb3b49f42a" + sha256: dec14c9b36d9bbaaf007da5998f5dc72a2dbd5b877601d7b7970bb42524b3ced url: "https://pub.dev" source: hosted - version: "10.0.1" + version: "11.0.1" extended_text_library: dependency: transitive description: name: extended_text_library - sha256: "6d06b0ac53a09989e9864549f133c19c676d1456c5ee9470e2483f3cb1900f6e" + sha256: c06fbd8e3b6eedadf50cd6c109bbbd80921a6c43e4422d3b4ec9d4cb36ce4555 url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "11.0.2" external_app_launcher: dependency: "direct main" description: @@ -1775,4 +1775,4 @@ packages: version: "3.1.1" sdks: dart: ">=3.0.0-0 <4.0.0" - flutter: ">=3.7.0" + flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index c810290754..80fc195c13 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -199,7 +199,7 @@ dependencies: flutter_keyboard_visibility: 5.4.1 - extended_text: 10.0.1 + extended_text: 11.0.1 flutter_app_badger: 1.5.0 From be8aebcc0274ac4ab3ca5d3a57d17e3b882bbf12 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 16:41:19 +0700 Subject: [PATCH 10/14] Upgrade html_editor_enhanced --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 4c6386f99f..19cec56dac 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -889,8 +889,8 @@ packages: dependency: "direct main" description: path: "." - ref: email_supported - resolved-ref: "8366fa04e852e654c98a864539f77a6edf94e642" + ref: "upgrade_v3.10.6" + resolved-ref: e268d4762b9117029ed03b2e61b384f3705d32f9 url: "https://github.com/linagora/html-editor-enhanced.git" source: git version: "2.5.1" @@ -1074,10 +1074,10 @@ packages: dependency: transitive description: name: numberpicker - sha256: "73723bd13c940ebcd9e5f0ed56b4874588c1748a9a6a38254f97ad627715142e" + sha256: "4c129154944b0f6b133e693f8749c3f8bfb67c4d07ef9dcab48b595c22d1f156" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" package_config: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 80fc195c13..5d603afd9e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,7 +54,7 @@ dependencies: html_editor_enhanced: git: url: https://github.com/linagora/html-editor-enhanced.git - ref: email_supported + ref: upgrade_v3.10.6 jmap_dart_client: git: From 7179cb50c4508cab4d546466aca88690308add2e Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 16:46:27 +0700 Subject: [PATCH 11/14] Upgrade environment sdk --- contact/pubspec.yaml | 2 +- core/pubspec.yaml | 2 +- fcm/pubspec.yaml | 2 +- forward/pubspec.yaml | 2 +- ios/Podfile.lock | 8 ++++---- ios/Runner.xcodeproj/project.pbxproj | 1 + model/pubspec.yaml | 2 +- pubspec.lock | 2 +- pubspec.yaml | 2 +- rule_filter/pubspec.yaml | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/contact/pubspec.yaml b/contact/pubspec.yaml index ff87412965..97466ee95c 100644 --- a/contact/pubspec.yaml +++ b/contact/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.19.2 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: diff --git a/core/pubspec.yaml b/core/pubspec.yaml index f9c18c9b81..8b77862b42 100644 --- a/core/pubspec.yaml +++ b/core/pubspec.yaml @@ -20,7 +20,7 @@ publish_to: none version: 1.0.0+1 environment: - sdk: ">=2.19.2 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: diff --git a/fcm/pubspec.yaml b/fcm/pubspec.yaml index 42df06ce1e..ae1e8acd9d 100644 --- a/fcm/pubspec.yaml +++ b/fcm/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.19.2 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: diff --git a/forward/pubspec.yaml b/forward/pubspec.yaml index bc8ccdcd35..94181ea0ca 100644 --- a/forward/pubspec.yaml +++ b/forward/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.19.2 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ad37c6eb7f..7a6e8a0a66 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -197,11 +197,11 @@ DEPENDENCIES: - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - workmanager (from `.symlinks/plugins/workmanager/ios`) @@ -267,7 +267,7 @@ EXTERNAL SOURCES: package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/ios" + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" receive_sharing_intent: @@ -275,7 +275,7 @@ EXTERNAL SOURCES: share_plus: :path: ".symlinks/plugins/share_plus/ios" shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/ios" + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" workmanager: diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4808a8c17e..ac0913bd66 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -306,6 +306,7 @@ files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( diff --git a/model/pubspec.yaml b/model/pubspec.yaml index 4ce15a4b8c..579d0d3aa0 100644 --- a/model/pubspec.yaml +++ b/model/pubspec.yaml @@ -20,7 +20,7 @@ publish_to: none version: 1.0.0+1 environment: - sdk: ">=2.19.2 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: diff --git a/pubspec.lock b/pubspec.lock index 19cec56dac..1b1145cf77 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1774,5 +1774,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 5d603afd9e..2de14f3dcd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 0.8.6 environment: - sdk: ">=2.19.2 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: diff --git a/rule_filter/pubspec.yaml b/rule_filter/pubspec.yaml index 7c90a5c3db..3406395aad 100644 --- a/rule_filter/pubspec.yaml +++ b/rule_filter/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.19.2 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: From aaae287eecba069430cba48d8bfc00a2ce457613 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 17:07:09 +0700 Subject: [PATCH 12/14] Upgrade flutter to `v3.10.6` for Dockerfile --- .github/workflows/analyze-test.yaml | 2 +- .github/workflows/build.yaml | 2 +- .github/workflows/pr-deployments.yaml | 2 +- .github/workflows/release.yaml | 2 +- Dockerfile | 2 +- android/build.gradle | 2 +- contact/pubspec.lock | 2 +- core/pubspec.lock | 2 +- fcm/pubspec.lock | 2 +- forward/pubspec.lock | 2 +- model/pubspec.lock | 2 +- rule_filter/pubspec.lock | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/analyze-test.yaml b/.github/workflows/analyze-test.yaml index 38512d6066..7485a81c1e 100644 --- a/.github/workflows/analyze-test.yaml +++ b/.github/workflows/analyze-test.yaml @@ -30,7 +30,7 @@ jobs: - name: Setup flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.7.5" + flutter-version: "3.10.6" channel: "stable" cache: true cache-key: "deps-${{ hashFiles('**/pubspec.lock') }}" diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fc76c00157..6410da61cc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,7 +23,7 @@ jobs: - name: Setup flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.7.5" + flutter-version: "3.10.6" channel: "stable" cache: true cache-key: deps-${{ hashFiles('**/pubspec.lock') }} # optional, change this to force refresh cache diff --git a/.github/workflows/pr-deployments.yaml b/.github/workflows/pr-deployments.yaml index 37c1469f42..fd7268f545 100644 --- a/.github/workflows/pr-deployments.yaml +++ b/.github/workflows/pr-deployments.yaml @@ -20,7 +20,7 @@ jobs: - name: Setup flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.7.5" + flutter-version: "3.10.6" channel: "stable" cache: true cache-key: deps-${{ hashFiles('**/pubspec.lock') }} # optional, change this to force refresh cache diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2773ec3af1..f14ce8f1ca 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,7 +28,7 @@ jobs: - name: Setup flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.7.5" + flutter-version: "3.10.6" channel: "stable" cache: true cache-key: deps-${{ hashFiles('**/pubspec.lock') }} # optional, change this to force refresh cache diff --git a/Dockerfile b/Dockerfile index b15b7dbe73..def87bf750 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Stage 1 - Install dependencies and build the app # This matches the flutter version on our CI/CD pipeline on Github -FROM cirrusci/flutter:3.7.5 AS build-env +FROM ghcr.io/cirruslabs/flutter:3.10.6 AS build-env # Set directory to Copy App WORKDIR /app diff --git a/android/build.gradle b/android/build.gradle index 17157e57c0..86463c2f28 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,6 +25,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/contact/pubspec.lock b/contact/pubspec.lock index 15ab2b2030..9ef7e2a9fb 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -1005,5 +1005,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.7.0" diff --git a/core/pubspec.lock b/core/pubspec.lock index ae5dadcafb..66fa328979 100644 --- a/core/pubspec.lock +++ b/core/pubspec.lock @@ -654,5 +654,5 @@ packages: source: hosted version: "6.2.2" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.7.0" diff --git a/fcm/pubspec.lock b/fcm/pubspec.lock index 95f1da2e60..e04b2a5337 100644 --- a/fcm/pubspec.lock +++ b/fcm/pubspec.lock @@ -570,5 +570,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.0.0" diff --git a/forward/pubspec.lock b/forward/pubspec.lock index 95f1da2e60..e04b2a5337 100644 --- a/forward/pubspec.lock +++ b/forward/pubspec.lock @@ -570,5 +570,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.0.0" diff --git a/model/pubspec.lock b/model/pubspec.lock index 7b6bab6d0e..d05b75d941 100644 --- a/model/pubspec.lock +++ b/model/pubspec.lock @@ -982,5 +982,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.7.0" diff --git a/rule_filter/pubspec.lock b/rule_filter/pubspec.lock index 95f1da2e60..e04b2a5337 100644 --- a/rule_filter/pubspec.lock +++ b/rule_filter/pubspec.lock @@ -570,5 +570,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.0.0" From 86e778dc90e442ed403415e012a8250d19389d49 Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 17 Jul 2023 17:07:58 +0700 Subject: [PATCH 13/14] Use `dart run` replace `flutter pub run` deprecated --- prebuild.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/prebuild.sh b/prebuild.sh index 856b864427..9ad7105a21 100644 --- a/prebuild.sh +++ b/prebuild.sh @@ -12,22 +12,22 @@ flutter pub get # flutter pub get && pod install cd ../model -flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get && dart run build_runner build --delete-conflicting-outputs cd ../contact -flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get && dart run build_runner build --delete-conflicting-outputs cd ../forward -flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get && dart run build_runner build --delete-conflicting-outputs cd ../rule_filter -flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get && dart run build_runner build --delete-conflicting-outputs cd ../fcm -flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get && dart run build_runner build --delete-conflicting-outputs cd .. flutter pub get \ - && flutter pub run build_runner build --delete-conflicting-outputs \ - && flutter pub run intl_generator:extract_to_arb --output-dir=./lib/l10n lib/main/localizations/app_localizations.dart \ - && flutter pub run intl_generator:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/main/localizations/app_localizations.dart lib/l10n/intl*.arb + && dart run build_runner build --delete-conflicting-outputs \ + && dart run intl_generator:extract_to_arb --output-dir=./lib/l10n lib/main/localizations/app_localizations.dart \ + && dart run intl_generator:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/main/localizations/app_localizations.dart lib/l10n/intl*.arb From 1e417246521f0b70c200a057dc5fcf35bbba3a94 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 18 Jul 2023 14:53:14 +0700 Subject: [PATCH 14/14] Update dependencies compatible flutter 3.10.x --- pubspec.lock | 12 ++++++------ pubspec.yaml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 1b1145cf77..f8425e2571 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -602,8 +602,8 @@ packages: dependency: "direct main" description: path: "." - ref: "upgrade_v3.10.6" - resolved-ref: a3b41a21e18cd0884a834c45c51d751fae391f36 + ref: upgrade_3_10_x + resolved-ref: c57066ac64bca6f5f475039032da1758dacd7075 url: "https://github.com/linagora/flutter-date-range-picker.git" source: git version: "1.0.2" @@ -889,8 +889,8 @@ packages: dependency: "direct main" description: path: "." - ref: "upgrade_v3.10.6" - resolved-ref: e268d4762b9117029ed03b2e61b384f3705d32f9 + ref: upgrade_3_10_x + resolved-ref: "33559b23eebea37dee9e78bdbd9854d211b1fb6e" url: "https://github.com/linagora/html-editor-enhanced.git" source: git version: "2.5.1" @@ -1496,8 +1496,8 @@ packages: dependency: "direct main" description: path: "." - ref: "upgrade_v3.10.6" - resolved-ref: "08a743cd37fd3d8cce072bd278f7d8132fe95ed1" + ref: upgrade_3_10_x + resolved-ref: b28a36844b6e8e1dd7f252570841942240bf3d9d url: "https://github.com/dab246/super_tag_editor.git" source: git version: "0.1.3" diff --git a/pubspec.yaml b/pubspec.yaml index 2de14f3dcd..ab0275a0c9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,7 +54,7 @@ dependencies: html_editor_enhanced: git: url: https://github.com/linagora/html-editor-enhanced.git - ref: upgrade_v3.10.6 + ref: upgrade_3_10_x jmap_dart_client: git: @@ -79,12 +79,12 @@ dependencies: flutter_date_range_picker: git: url: https://github.com/linagora/flutter-date-range-picker.git - ref: upgrade_v3.10.6 + ref: upgrade_3_10_x super_tag_editor: git: url: https://github.com/dab246/super_tag_editor.git - ref: upgrade_v3.10.6 + ref: upgrade_3_10_x ### Dependencies from pub.dev ### cupertino_icons: 1.0.5