From abd0d4709f3db39d5f2f3c693e95f283c6691d2b Mon Sep 17 00:00:00 2001 From: jld3103 Date: Wed, 10 May 2023 21:44:33 +0200 Subject: [PATCH] Update flutter to 3.10 --- .fvm/fvm_config.json | 2 +- packages/app/android/build.gradle | 2 +- packages/app/pubspec.lock | 80 +++++++++---------- packages/app/pubspec.yaml | 4 +- .../app/test_driver/integration_test.dart | 2 +- packages/dynamite/pubspec.yaml | 2 +- packages/file_icons/pubspec.yaml | 4 +- packages/neon/neon/pubspec.yaml | 6 +- packages/neon/neon_files/pubspec.yaml | 4 +- .../lib/dialogs/feed_update_error.dart | 2 +- packages/neon/neon_news/pubspec.yaml | 4 +- packages/neon/neon_notes/pubspec.yaml | 4 +- packages/neon/neon_notifications/pubspec.yaml | 4 +- packages/nextcloud/pubspec.yaml | 4 +- packages/settings/pubspec.yaml | 4 +- packages/sort_box/pubspec.yaml | 2 +- packages/spec_templates/pubspec.yaml | 2 +- 17 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 03b88342..ff362fd2 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.7.12@stable", + "flutterSdkVersion": "3.10.0@stable", "flavors": {} } \ No newline at end of file diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle index bb32d997..6dbb0ea0 100644 --- a/packages/app/android/build.gradle +++ b/packages/app/android/build.gradle @@ -27,6 +27,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index c692bf7a..baf0ebf0 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: archive - sha256: "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb" + sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" url: "https://pub.dev" source: hosted - version: "3.3.2" + version: "3.3.7" 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: @@ -45,10 +45,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" clock: dependency: transitive description: @@ -61,10 +61,10 @@ packages: 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: @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" crypton: dependency: transitive description: @@ -367,18 +367,18 @@ packages: dependency: transitive 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: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -399,10 +399,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: @@ -431,10 +431,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: @@ -538,10 +538,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: @@ -650,10 +650,10 @@ packages: dependency: transitive description: name: petitparser - sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.4.0" platform: dependency: transitive description: @@ -941,10 +941,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" timezone: dependency: transitive description: @@ -965,10 +965,10 @@ packages: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" unifiedpush: dependency: transitive description: @@ -1077,26 +1077,26 @@ packages: dependency: transitive description: name: vector_graphics - sha256: ea8d3fc7b2e0f35de38a7465063ecfcf03d8217f7962aa2a6717132cb5d43a79 + sha256: "59a230f8bf37dd8b077335d1d64d895bccef0fb14f50730e3d79e8990bf3ed2b" url: "https://pub.dev" source: hosted - version: "1.1.5" + version: "1.1.5+1" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: a5eaa5d19e123ad4f61c3718ca1ed921c4e6254238d9145f82aa214955d9aced + sha256: "40781fe91c6d10a617c0289f7ec16cdb2d85a7f3654af2778c6d0adbf3bf45a3" url: "https://pub.dev" source: hosted - version: "1.1.5" + version: "1.1.5+1" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "15edc42f7eaa478ce854eaf1fbb9062a899c0e4e56e775dd73b7f4709c97c4ca" + sha256: "6ca1298b70edcc3486fdb14032f1a186a593f1b5f6b5e82fb10febddcb1c61bb" url: "https://pub.dev" source: hosted - version: "1.1.5" + version: "1.1.5+1" vector_math: dependency: transitive description: @@ -1117,10 +1117,10 @@ packages: dependency: transitive description: name: vm_service - sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7 + sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe url: "https://pub.dev" source: hosted - version: "9.4.0" + version: "11.3.0" wakelock: dependency: transitive description: @@ -1166,10 +1166,10 @@ packages: dependency: transitive description: name: webdriver - sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841 + sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" webview_flutter: dependency: transitive description: @@ -1230,10 +1230,10 @@ packages: dependency: transitive description: name: xml - sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.3.0" xml_annotation: dependency: transitive description: @@ -1251,5 +1251,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=2.19.0 <3.0.0" - flutter: ">=3.7.12" + dart: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml index 96819bc1..85394469 100644 --- a/packages/app/pubspec.yaml +++ b/packages/app/pubspec.yaml @@ -3,8 +3,8 @@ version: 1.0.0 publish_to: 'none' environment: - sdk: '>=2.19.0 <3.0.0' - flutter: '>=3.7.12' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: flutter: diff --git a/packages/app/test_driver/integration_test.dart b/packages/app/test_driver/integration_test.dart index ad5bc6e3..dfa7edae 100644 --- a/packages/app/test_driver/integration_test.dart +++ b/packages/app/test_driver/integration_test.dart @@ -6,7 +6,7 @@ Future main() async { Directory('screenshots').createSync(); try { await integrationDriver( - onScreenshot: (final screenshotName, final screenshotBytes) async { + onScreenshot: (final screenshotName, final screenshotBytes, [final args]) async { final file = File('screenshots/$screenshotName.png'); if (!file.existsSync()) { file.writeAsBytesSync(screenshotBytes); diff --git a/packages/dynamite/pubspec.yaml b/packages/dynamite/pubspec.yaml index 6e6e5a57..360d8cc0 100644 --- a/packages/dynamite/pubspec.yaml +++ b/packages/dynamite/pubspec.yaml @@ -2,7 +2,7 @@ name: dynamite version: 1.0.0 environment: - sdk: '>=2.19.0 <3.0.0' + sdk: '>=3.0.0 <4.0.0' dependencies: build: ^2.3.1 diff --git a/packages/file_icons/pubspec.yaml b/packages/file_icons/pubspec.yaml index 9c2d49c7..3cdbd1f6 100644 --- a/packages/file_icons/pubspec.yaml +++ b/packages/file_icons/pubspec.yaml @@ -2,8 +2,8 @@ name: file_icons version: 1.0.0 environment: - sdk: '>=2.19.0 <3.0.0' - flutter: '>=3.7.12' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: flutter: diff --git a/packages/neon/neon/pubspec.yaml b/packages/neon/neon/pubspec.yaml index 0a017307..a1e4a1fd 100644 --- a/packages/neon/neon/pubspec.yaml +++ b/packages/neon/neon/pubspec.yaml @@ -3,8 +3,8 @@ version: 1.0.0 publish_to: 'none' environment: - sdk: '>=2.19.0 <3.0.0' - flutter: '>=3.7.12' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: collection: ^1.16.0 @@ -21,7 +21,7 @@ dependencies: flutter_native_splash: ^2.2.0+1 flutter_svg: ^2.0.5 http: ^0.13.4 - intl: ^0.17.0 + intl: ^0.18.0 json_annotation: ^4.7.0 material_design_icons_flutter: ^6.0.7096 nextcloud: diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/neon/neon_files/pubspec.yaml index 4c8f1f02..48a784f7 100644 --- a/packages/neon/neon_files/pubspec.yaml +++ b/packages/neon/neon_files/pubspec.yaml @@ -3,8 +3,8 @@ version: 1.0.0 publish_to: 'none' environment: - sdk: '>=2.19.0 <3.0.0' - flutter: '>=3.7.12' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: collection: ^1.17.0 diff --git a/packages/neon/neon_news/lib/dialogs/feed_update_error.dart b/packages/neon/neon_news/lib/dialogs/feed_update_error.dart index 441467dd..b8889fcd 100644 --- a/packages/neon/neon_news/lib/dialogs/feed_update_error.dart +++ b/packages/neon/neon_news/lib/dialogs/feed_update_error.dart @@ -21,7 +21,7 @@ class _NewsFeedUpdateErrorDialogState extends State { onPressed: () async { await Clipboard.setData( ClipboardData( - text: widget.feed.lastUpdateError, + text: widget.feed.lastUpdateError!, ), ); if (mounted) { diff --git a/packages/neon/neon_news/pubspec.yaml b/packages/neon/neon_news/pubspec.yaml index 78d9d869..8c285681 100644 --- a/packages/neon/neon_news/pubspec.yaml +++ b/packages/neon/neon_news/pubspec.yaml @@ -3,8 +3,8 @@ version: 1.0.0 publish_to: 'none' environment: - sdk: '>=2.19.0 <3.0.0' - flutter: '>=3.7.12' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: flutter: diff --git a/packages/neon/neon_notes/pubspec.yaml b/packages/neon/neon_notes/pubspec.yaml index d5a565f8..74e7a385 100644 --- a/packages/neon/neon_notes/pubspec.yaml +++ b/packages/neon/neon_notes/pubspec.yaml @@ -3,8 +3,8 @@ version: 1.0.0 publish_to: 'none' environment: - sdk: '>=2.19.0 <3.0.0' - flutter: '>=3.7.12' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: crypto: ^3.0.2 diff --git a/packages/neon/neon_notifications/pubspec.yaml b/packages/neon/neon_notifications/pubspec.yaml index 43cf2587..76cf4b88 100644 --- a/packages/neon/neon_notifications/pubspec.yaml +++ b/packages/neon/neon_notifications/pubspec.yaml @@ -3,8 +3,8 @@ version: 1.0.0 publish_to: 'none' environment: - sdk: '>=2.19.0 <3.0.0' - flutter: '>=3.7.12' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: flutter: diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml index 9bf80d2a..92c2ee6b 100644 --- a/packages/nextcloud/pubspec.yaml +++ b/packages/nextcloud/pubspec.yaml @@ -2,13 +2,13 @@ name: nextcloud version: 1.0.0 environment: - sdk: '>=2.19.0 <3.0.0' + sdk: '>=3.0.0 <4.0.0' dependencies: cookie_jar: ^4.0.2 crypto: ^3.0.2 crypton: ^2.0.5 - intl: ^0.17.0 + intl: ^0.18.0 json_annotation: ^4.7.0 version: ^3.0.2 xml: ^6.1.0 diff --git a/packages/settings/pubspec.yaml b/packages/settings/pubspec.yaml index 864685d2..388a3a10 100644 --- a/packages/settings/pubspec.yaml +++ b/packages/settings/pubspec.yaml @@ -2,8 +2,8 @@ name: settings version: 1.0.0 environment: - sdk: '>=2.19.0 <3.0.0' - flutter: '>=3.7.12' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: flutter: diff --git a/packages/sort_box/pubspec.yaml b/packages/sort_box/pubspec.yaml index 1b161130..a63c3af1 100644 --- a/packages/sort_box/pubspec.yaml +++ b/packages/sort_box/pubspec.yaml @@ -2,7 +2,7 @@ name: sort_box version: 1.0.0 environment: - sdk: '>=2.19.0 <3.0.0' + sdk: '>=3.0.0 <4.0.0' dev_dependencies: nit_picking: diff --git a/packages/spec_templates/pubspec.yaml b/packages/spec_templates/pubspec.yaml index bb23f200..fbcaf612 100644 --- a/packages/spec_templates/pubspec.yaml +++ b/packages/spec_templates/pubspec.yaml @@ -3,7 +3,7 @@ version: 1.0.0 publish_to: 'none' environment: - sdk: '>=2.19.0 <3.0.0' + sdk: '>=3.0.0 <4.0.0' dependencies: path: ^1.8.1