Skip to content

Commit 698ffb2

Browse files
committed
flutter 3.32.1
1 parent 797d89d commit 698ffb2

File tree

7 files changed

+57
-18
lines changed

7 files changed

+57
-18
lines changed

.github/workflows/flutter-drive.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
# https://github.com/marketplace/actions/flutter-action
5353
- uses: subosito/flutter-action@v2
5454
with:
55-
flutter-version: '3.29.0'
55+
flutter-version: '3.32.1'
5656
channel: 'stable' # or: 'dev' or 'beta'
5757
- run: "flutter clean"
5858
- name: "Run Flutter Driver tests"
@@ -76,7 +76,7 @@ jobs:
7676
java-version: "17"
7777
- uses: subosito/flutter-action@v2
7878
with:
79-
flutter-version: '3.29.0'
79+
flutter-version: '3.32.1'
8080
channel: 'stable' # or: 'dev' or 'beta'
8181
- name: "Run Flutter Driver tests"
8282
# GitHub Action for installing, configuring and running Android Emulators (work only Mac OS)
@@ -101,7 +101,7 @@ jobs:
101101
# https://github.com/marketplace/actions/flutter-action
102102
- uses: subosito/flutter-action@v2
103103
with:
104-
flutter-version: '3.29.0'
104+
flutter-version: '3.32.1'
105105
channel: 'stable'
106106
- run: "flutter pub get"
107107
- name: "Run Flutter Accessibility Tests"

devtools_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: This file stores settings for Dart & Flutter DevTools.
2+
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
3+
extensions:
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#
2+
# Generated file, do not edit.
3+
#
4+
5+
import lldb
6+
7+
def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
8+
"""Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
9+
base = frame.register["x0"].GetValueAsAddress()
10+
page_len = frame.register["x1"].GetValueAsUnsigned()
11+
12+
# Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
13+
# first page to see if handled it correctly. This makes diagnosing
14+
# misconfiguration (e.g. missing breakpoint) easier.
15+
data = bytearray(page_len)
16+
data[0:8] = b'IHELPED!'
17+
18+
error = lldb.SBError()
19+
frame.GetThread().GetProcess().WriteMemory(base, data, error)
20+
if not error.Success():
21+
print(f'Failed to write into {base}[+{page_len}]', error)
22+
return
23+
24+
def __lldb_init_module(debugger: lldb.SBDebugger, _):
25+
target = debugger.GetDummyTarget()
26+
# Caveat: must use BreakpointCreateByRegEx here and not
27+
# BreakpointCreateByName. For some reasons callback function does not
28+
# get carried over from dummy target for the later.
29+
bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
30+
bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
31+
bp.SetAutoContinue(True)
32+
print("-- LLDB integration loaded --")
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# Generated file, do not edit.
3+
#
4+
5+
command script import --relative-to-command-file flutter_lldb_helper.py

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -43,6 +44,7 @@
4344
buildConfiguration = "Debug"
4445
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4546
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4648
launchStyle = "0"
4749
useCustomWorkingDirectory = "NO"
4850
ignoresPersistentStateOnLaunch = "NO"

lib/l10n/deer_localizations.dart

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,16 @@ abstract class DeerLocalizations {
8282
/// Additional delegates can be added by appending to this list in
8383
/// MaterialApp. This list does not have to be used at all if a custom list
8484
/// of delegates is preferred or required.
85-
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
85+
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
86+
<LocalizationsDelegate<dynamic>>[
8687
delegate,
8788
GlobalMaterialLocalizations.delegate,
8889
GlobalCupertinoLocalizations.delegate,
8990
GlobalWidgetsLocalizations.delegate,
9091
];
9192

9293
/// A list of this localizations delegate's supported locales.
93-
static const List<Locale> supportedLocales = <Locale>[
94-
Locale('en'),
95-
Locale('zh')
96-
];
94+
static const List<Locale> supportedLocales = <Locale>[Locale('en'), Locale('zh')];
9795

9896
/// Title for the application
9997
///
@@ -220,18 +218,17 @@ class _DeerLocalizationsDelegate extends LocalizationsDelegate<DeerLocalizations
220218
}
221219

222220
DeerLocalizations lookupDeerLocalizations(Locale locale) {
223-
224-
225221
// Lookup logic when only language code is specified.
226222
switch (locale.languageCode) {
227-
case 'en': return DeerLocalizationsEn();
228-
case 'zh': return DeerLocalizationsZh();
223+
case 'en':
224+
return DeerLocalizationsEn();
225+
case 'zh':
226+
return DeerLocalizationsZh();
229227
}
230228

231229
throw FlutterError(
232-
'DeerLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
233-
'an issue with the localizations generation tool. Please file an issue '
234-
'on GitHub with a reproducible sample app and the gen-l10n configuration '
235-
'that was used.'
236-
);
230+
'DeerLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
231+
'an issue with the localizations generation tool. Please file an issue '
232+
'on GitHub with a reproducible sample app and the gen-l10n configuration '
233+
'that was used.');
237234
}

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
# 去除网页URL中的“#”(hash) https://flutter.cn/docs/development/ui/navigation/url-strategies
2020
url_strategy: 0.3.0
2121
# Localization https://github.com/dart-lang/intl
22-
intl: ^0.19.0
22+
intl: ^0.20.2
2323
# Toast插件 https://github.com/OpenFlutter/flutter_oktoast
2424
oktoast: ^3.4.0
2525
# 网络库 https://github.com/cfug/dio

0 commit comments

Comments
 (0)