From 5a14927ba3c6a9f0a01f4ba1543d3c688e5d00da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 20 Aug 2023 11:19:09 +1000 Subject: [PATCH] chore(flutter): update dependency flutter to v3.13.0 (#841) * chore(flutter): update dependency flutter to v3.13.0 * chore: fix flutter dependencies * fix: expansion panel list to expand properly --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Joshua Tang --- .fvm/fvm_config.json | 2 +- example/pubspec.lock | 42 +++++++++---------- lib/home/views/home_page.dart | 2 +- .../list_views/expansion_panel_list.dart | 8 ++-- macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- pubspec.lock | 40 +++++++++++------- pubspec.yaml | 6 +-- 8 files changed, 56 insertions(+), 48 deletions(-) diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 2f49d155..7d9198e3 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.10.6", + "flutterSdkVersion": "3.13.0", "flavors": {} } \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 480cc762..8014b07c 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" cupertino_icons: dependency: "direct main" description: @@ -122,14 +122,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.18.1" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" json_class: dependency: transitive description: @@ -182,18 +174,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -251,10 +243,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -299,10 +291,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" typed_data: dependency: transitive description: @@ -331,10 +323,18 @@ packages: dependency: transitive description: name: vm_service - sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe + sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f + url: "https://pub.dev" + source: hosted + version: "11.7.1" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "11.3.0" + version: "0.1.4-beta" webdriver: dependency: transitive description: @@ -344,4 +344,4 @@ packages: source: hosted version: "3.0.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" diff --git a/lib/home/views/home_page.dart b/lib/home/views/home_page.dart index aa46f69c..6dc36c5f 100644 --- a/lib/home/views/home_page.dart +++ b/lib/home/views/home_page.dart @@ -16,7 +16,7 @@ class HomePage extends StatefulWidget { } class HomePageState extends State { - static const _sdkVersion = '3.10.0+'; + static const _sdkVersion = '3.13.0+'; static final _backgroundColorDark = Colors.grey[900]!; static final _backgroundColorLight = Colors.grey[200]!; diff --git a/lib/widgets/list_views/expansion_panel_list.dart b/lib/widgets/list_views/expansion_panel_list.dart index 388554e5..3b8d71cf 100644 --- a/lib/widgets/list_views/expansion_panel_list.dart +++ b/lib/widgets/list_views/expansion_panel_list.dart @@ -1,7 +1,7 @@ +import 'package:appainter/common/common.dart'; import 'package:appainter/widgets/widgets.dart'; import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; -import 'package:appainter/common/common.dart'; abstract class ExpansionPanelItem extends StatelessWidget { String get header; @@ -41,9 +41,9 @@ class _MyExpansionPanelListState extends State { return SingleChildScrollView( child: ExpansionPanelList( expandedHeaderPadding: EdgeInsets.zero, - expansionCallback: (int index, bool isExpanded) { - setState(() => _expandStates[index] = !isExpanded); - }, + expansionCallback: (int index, bool isExpanded) => setState( + () => _expandStates[index] = isExpanded, + ), children: widget.items.mapIndexed((index, item) { return ExpansionPanel( headerBuilder: (context, isExpanded) => _Header(item: item), diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 8c281676..a4f8fbe1 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -205,7 +205,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 97bbe2f3..c57a4469 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =3.0.0 <4.0.0" - flutter: ">=3.10.6" + dart: ">=3.1.0-185.0.dev <4.0.0" + flutter: ">=3.13.0" diff --git a/pubspec.yaml b/pubspec.yaml index a5ed2b1d..77d145ae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,13 +6,13 @@ version: 1.8.4-next+5 environment: sdk: ">=3.0.0 <4.0.0" - flutter: 3.10.6 + flutter: 3.13.0 dependencies: appainter_annotations: path: packages/annotations bloc: 8.1.2 - collection: 1.17.1 + collection: ^1.17.2 copy_with_extension: 5.0.4 cupertino_icons: 1.0.5 device_preview: 1.1.0 @@ -33,7 +33,7 @@ dependencies: google_fonts: 5.1.0 intl: 0.18.1 json_theme: 6.2.3 - material_color_utilities: 0.2.0 + material_color_utilities: ^0.5.0 material_design_icons_flutter: 7.0.7296 ndialog: 4.3.1 path_provider: 2.1.0