Skip to content

Commit

Permalink
Merge branch 'main' into fix-10464
Browse files Browse the repository at this point in the history
  • Loading branch information
atsansone committed May 16, 2024
2 parents 1b40284 + 582c005 commit 4eb1602
Show file tree
Hide file tree
Showing 196 changed files with 677 additions and 299 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -44,7 +44,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@ccf74c947955fd1cf117aef6a0e4e66191ef6f61
uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -58,4 +58,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61
uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6
2 changes: 1 addition & 1 deletion .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61
uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6
with:
sarif_file: results.sarif
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- name: "Stable channel"
branch: stable
experimental: false
continue-on-error: ${{ matrix.experimental }}
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
with:
Expand All @@ -40,6 +41,7 @@ jobs:
channel: ${{ matrix.branch }}
- name: Fetch Dart dependencies
run: dart pub get
continue-on-error: ${{ matrix.experimental }}
- name: Check Dart code formatting
run: dart run flutter_site format-dart --check
continue-on-error: ${{ matrix.experimental }}
Expand Down
2 changes: 1 addition & 1 deletion examples/_animation/basic_hero_animation/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: >-
Shows how to create a simple or Hero animation using the Hero class directly.
environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
as it animates to the new route.
environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/_animation/basic_staggered_animation/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish_to: none
description: An introductory example to staggered animations.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/_animation/hero_animation/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish_to: none
description: Shows how to create a simple Hero transition.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/_animation/radial_hero_animation/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
as it animates to the new route.
environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
as it animates to the new route.
environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/_animation/staggered_pic_selection/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish_to: none
description: A more complex staggered animation example.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/animation/animate0/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
version: 1.0.0

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/animation/animate1/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
version: 1.0.0

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/animation/animate2/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
version: 1.0.0

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/animation/animate3/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
version: 1.0.0

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/animation/animate4/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
version: 1.0.0

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/animation/animate5/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
version: 1.0.0

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/animation/implicit/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publish_to: none
version: 1.0.0+1

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/basics/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Some code to demonstrate null safety.
version: 1.0.0

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/codelabs
Submodule codelabs updated 1586 files
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: animated_container
description: Sample code for cookbook.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/animation/opacity_animation/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: opacity_animation
description: Sample code for cookbook.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: page_route_animation
description: Sample code for cookbook.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: physics_simulation
description: Sample code for cookbook.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/design/drawer/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: drawer
description: Sample code for drawer cookbook recipe.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/design/fonts/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: none
version: 1.0.0+1

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/design/orientation/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: orientation
description: Sample code for orientation cookbook recipe.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/design/package_fonts/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: none
version: 1.0.0+1

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/design/snackbars/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: snackbars
description: Sample code for snackbars cookbook recipe.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/design/tabs/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: tabs
description: Sample code for tabs cookbook recipe.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/design/themes/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: themes
description: Sample code for themes cookbook recipe.

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/effects/download_button/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: none
version: 1.0.0+1

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/effects/drag_a_widget/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: none
version: 1.0.0+1

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/effects/expandable_fab/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publish_to: none
version: 1.0.0+1

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion examples/cookbook/effects/gradient_bubbles/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: none
version: 1.0.0+1

environment:
sdk: ^3.3.0
sdk: ^3.4.0

dependencies:
flutter:
Expand Down
8 changes: 4 additions & 4 deletions examples/cookbook/effects/nested_nav/lib/add_navigator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class SelectDevicePage extends StatelessWidget {
height: 54,
child: ElevatedButton(
style: ButtonStyle(
backgroundColor: MaterialStateColor.resolveWith((states) {
backgroundColor: WidgetStateColor.resolveWith((states) {
return const Color(0xFF222222);
}),
),
Expand Down Expand Up @@ -338,14 +338,14 @@ class FinishedPage extends StatelessWidget {
const SizedBox(height: 32),
ElevatedButton(
style: ButtonStyle(
padding: MaterialStateProperty.resolveWith((states) {
padding: WidgetStateProperty.resolveWith((states) {
return const EdgeInsets.symmetric(
horizontal: 24, vertical: 12);
}),
backgroundColor: MaterialStateColor.resolveWith((states) {
backgroundColor: WidgetStateColor.resolveWith((states) {
return const Color(0xFF222222);
}),
shape: MaterialStateProperty.resolveWith((states) {
shape: WidgetStateProperty.resolveWith((states) {
return const StadiumBorder();
}),
),
Expand Down
8 changes: 4 additions & 4 deletions examples/cookbook/effects/nested_nav/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class SelectDevicePage extends StatelessWidget {
height: 54,
child: ElevatedButton(
style: ButtonStyle(
backgroundColor: MaterialStateColor.resolveWith((states) {
backgroundColor: WidgetStateColor.resolveWith((states) {
return const Color(0xFF222222);
}),
),
Expand Down Expand Up @@ -336,14 +336,14 @@ class FinishedPage extends StatelessWidget {
const SizedBox(height: 32),
ElevatedButton(
style: ButtonStyle(
padding: MaterialStateProperty.resolveWith((states) {
padding: WidgetStateProperty.resolveWith((states) {
return const EdgeInsets.symmetric(
horizontal: 24, vertical: 12);
}),
backgroundColor: MaterialStateColor.resolveWith((states) {
backgroundColor: WidgetStateColor.resolveWith((states) {
return const Color(0xFF222222);
}),
shape: MaterialStateProperty.resolveWith((states) {
shape: WidgetStateProperty.resolveWith((states) {
return const StadiumBorder();
}),
),
Expand Down

0 comments on commit 4eb1602

Please sign in to comment.