Merge branch 'main' into main

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
  target: ["apk --debug", "appbundle --debug", "ios --no-codesign", macos, web]
  steps:
  - name: Set up JDK 11
- uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+ uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
  with:
  java-version: 11
  distribution: temurin

.github/workflows/release_deploy_play_store.yml

@@ -34,7 +34,7 @@ jobs:
 
  # Setup Ruby, Bundler, and Gemfile dependencies
  - name: Setup Fastlane
- uses: ruby/setup-ruby@54a18e26dbbb1eabc604f317ade9a5788dddef81 # v1.159.0
+ uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # v1.165.1
  with:
  ruby-version: "2.6"
  bundler-cache: true

.github/workflows/release_draft_github_release.yml

@@ -78,7 +78,7 @@ jobs:
  sudo apt-get install -y libgtk-3-dev libx11-dev pkg-config cmake ninja-build libblkid-dev
  - name: Install Android dependencies
  if: matrix.target == 'Android'
- uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+ uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
  with:
  java-version: "12.x"
  distribution: temurin

.github/workflows/scorecards-analysis.yml

@@ -42,14 +42,14 @@ jobs:
 
  # Upload the results as artifacts (optional).
  - name: "Upload artifact"
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
+ uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
  with:
  name: SARIF file
  path: results.sarif
  retention-days: 5
 
  # Upload the results to GitHub's code scanning dashboard.
  - name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+ uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
  with:
  sarif_file: results.sarif

.github/workflows/test.yml

@@ -72,7 +72,7 @@ jobs:
  # Run the golden tests and upload failed test artifacts.
  - run: flutter test test_goldens
  - name: Upload goldens if tests fail
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
+ uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
  if: failure()
  with:
  name: goldens

android/Gemfile.lock

@@ -7,21 +7,21 @@ GEM
  public_suffix (>= 2.0.2, < 6.0)
  artifactory (3.0.15)
  atomos (0.1.3)
- aws-eventstream (1.2.0)
- aws-partitions (1.843.0)
- aws-sdk-core (3.185.2)
- aws-eventstream (~> 1, >= 1.0.2)
+ aws-eventstream (1.3.0)
+ aws-partitions (1.862.0)
+ aws-sdk-core (3.190.0)
+ aws-eventstream (~> 1, >= 1.3.0)
  aws-partitions (~> 1, >= 1.651.0)
- aws-sigv4 (~> 1.5)
+ aws-sigv4 (~> 1.8)
  jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.72.0)
- aws-sdk-core (~> 3, >= 3.184.0)
+ aws-sdk-kms (1.74.0)
+ aws-sdk-core (~> 3, >= 3.188.0)
  aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.136.0)
- aws-sdk-core (~> 3, >= 3.181.0)
+ aws-sdk-s3 (1.141.0)
+ aws-sdk-core (~> 3, >= 3.189.0)
  aws-sdk-kms (~> 1)
- aws-sigv4 (~> 1.6)
- aws-sigv4 (1.6.1)
+ aws-sigv4 (~> 1.8)
+ aws-sigv4 (1.8.0)
  aws-eventstream (~> 1, >= 1.0.2)
  babosa (1.0.4)
  claide (1.1.0)
@@ -32,11 +32,10 @@ GEM
  declarative (0.0.20)
  digest-crc (0.6.5)
  rake (>= 12.0.0, < 14.0.0)
- domain_name (0.5.20190701)
- unf (>= 0.0.5, < 1.0.0)
+ domain_name (0.6.20231109)
  dotenv (2.8.1)
  emoji_regex (3.2.3)
- excon (0.104.0)
+ excon (0.105.0)
  faraday (1.10.3)
  faraday-em_http (~> 1.0)
  faraday-em_synchrony (~> 1.0)
@@ -66,7 +65,7 @@ GEM
  faraday_middleware (1.2.0)
  faraday (~> 1.0)
  fastimage (2.2.7)
- fastlane (2.216.0)
+ fastlane (2.217.0)
  CFPropertyList (>= 2.3, < 4.0.0)
  addressable (>= 2.8, < 3.0.0)
  artifactory (~> 3.0)
@@ -107,7 +106,7 @@ GEM
  xcpretty (~> 0.3.0)
  xcpretty-travis-formatter (>= 0.0.3)
  gh_inspector (1.1.3)
- google-apis-androidpublisher_v3 (0.51.0)
+ google-apis-androidpublisher_v3 (0.53.0)
  google-apis-core (>= 0.11.0, < 2.a)
  google-apis-core (0.11.2)
  addressable (~> 2.5, >= 2.5.1)
@@ -122,19 +121,19 @@ GEM
  google-apis-core (>= 0.11.0, < 2.a)
  google-apis-playcustomapp_v1 (0.13.0)
  google-apis-core (>= 0.11.0, < 2.a)
- google-apis-storage_v1 (0.19.0)
- google-apis-core (>= 0.9.0, < 2.a)
+ google-apis-storage_v1 (0.29.0)
+ google-apis-core (>= 0.11.0, < 2.a)
  google-cloud-core (1.6.0)
  google-cloud-env (~> 1.0)
  google-cloud-errors (~> 1.0)
  google-cloud-env (1.6.0)
  faraday (>= 0.17.3, < 3.0)
  google-cloud-errors (1.3.1)
- google-cloud-storage (1.44.0)
+ google-cloud-storage (1.45.0)
  addressable (~> 2.8)
  digest-crc (~> 0.4)
  google-apis-iamcredentials_v1 (~> 0.1)
- google-apis-storage_v1 (~> 0.19.0)
+ google-apis-storage_v1 (~> 0.29.0)
  google-cloud-core (~> 1.6)
  googleauth (>= 0.16.2, < 2.a)
  mini_mime (~> 1.0)
@@ -149,7 +148,7 @@ GEM
  domain_name (~> 0.5)
  httpclient (2.8.3)
  jmespath (1.6.2)
- json (2.6.3)
+ json (2.7.0)
  jwt (2.7.1)
  mini_magick (4.12.0)
  mini_mime (1.1.5)
@@ -160,7 +159,7 @@ GEM
  optparse (0.1.1)
  os (1.1.4)
  plist (3.7.0)
- public_suffix (5.0.3)
+ public_suffix (5.0.4)
  rake (13.1.0)
  representable (3.2.0)
  declarative (< 0.1.0)
@@ -189,9 +188,6 @@ GEM
  tty-spinner (0.9.3)
  tty-cursor (~> 0.7)
  uber (0.1.0)
- unf (0.1.4)
- unf_ext
- unf_ext (0.0.8.2)
  unicode-display_width (2.5.0)
  webrick (1.8.1)
  word_wrap (1.0.0)

lib/codeviewer/code_segments.dart

@@ -3606,9 +3606,7 @@ class CodeSegments {
  TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
  TextSpan(style: codeStyle.punctuationStyle, text: '.'),
  TextSpan(style: codeStyle.baseStyle, text: 'showBottomSheet'),
- TextSpan(style: codeStyle.punctuationStyle, text: '<'),
- TextSpan(style: codeStyle.keywordStyle, text: 'void'),
- TextSpan(style: codeStyle.punctuationStyle, text: '>('),
+ TextSpan(style: codeStyle.punctuationStyle, text: '('),
  TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
  TextSpan(style: codeStyle.punctuationStyle, text: '('),
  TextSpan(style: codeStyle.baseStyle, text: 'context'),

lib/demos/material/bottom_sheet_demo.dart

@@ -158,7 +158,7 @@ class _PersistentBottomSheetDemoState
  });
 
  Scaffold.of(context)
- .showBottomSheet<void>(
+ .showBottomSheet(
  (context) {
  return _BottomSheetContent();
  },

lib/layout/highlight_focus.dart

@@ -78,8 +78,8 @@ class _HighlightFocusState extends State<HighlightFocus> {
  isFocused = newValue;
  });
  },
- onKey: (node, event) {
- if (event is RawKeyDownEvent &&
+ onKeyEvent: (node, event) {
+ if ((event is KeyDownEvent || event is KeyRepeatEvent) &&
  (event.logicalKey == LogicalKeyboardKey.space ||
  event.logicalKey == LogicalKeyboardKey.enter ||
  event.logicalKey == LogicalKeyboardKey.numpadEnter)) {

lib/pages/backdrop.dart

@@ -131,10 +131,10 @@ class _BackdropState extends State<Backdrop> with TickerProviderStateMixin {
  return ExcludeSemantics(
  excluding: !isSettingsOpen,
  child: isSettingsOpen
- ? RawKeyboardListener(
+ ? KeyboardListener(
  includeSemantics: false,
  focusNode: _settingsPageFocusNode,
- onKey: (event) {
+ onKeyEvent: (event) {
  if (event.logicalKey == LogicalKeyboardKey.escape) {
  _toggleSettings();
  }

lib/pages/demo.dart

@@ -167,7 +167,7 @@ class _GalleryDemoPageState extends State<GalleryDemoPage>
 
  if (await canLaunchUrlString(url)) {
  await launchUrlString(url);
- } else if (mounted) {
+ } else if (context.mounted) {
  await showDialog<void>(
  context: context,
  builder: (context) {

lib/studies/rally/login.dart

@@ -291,8 +291,8 @@ class _ThumbButtonState extends State<_ThumbButton> {
  child: GestureDetector(
  onTap: widget.onTap,
  child: Focus(
- onKey: (node, event) {
- if (event is RawKeyDownEvent) {
+ onKeyEvent: (node, event) {
+ if (event is KeyDownEvent || event is KeyRepeatEvent) {
  if (event.logicalKey == LogicalKeyboardKey.enter ||
  event.logicalKey == LogicalKeyboardKey.space) {
  widget.onTap();