Skip to content

Commit c97d18f

Browse files
Merge branch 'flutter:main' into flutter_gpu-enable-beta
2 parents e4705af + 702008f commit c97d18f

File tree

9 files changed

+28
-27
lines changed

9 files changed

+28
-27
lines changed

.github/workflows/flutter-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
os: [ubuntu-latest, macos-latest, windows-latest]
2828
steps:
2929
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
30-
- uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
30+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
3131
with:
3232
distribution: 'zulu' # See https://github.com/actions/setup-java#supported-distributions
3333
java-version: "17"

deeplink_cookbook/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ environment:
3030
dependencies:
3131
flutter:
3232
sdk: flutter
33-
go_router: ^14.0.0
33+
go_router: ^15.0.0
3434

3535

3636
# The following adds the Cupertino Icons font to your application.

flutter_ci_script_master.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ declare -a CODELABS=(
1717
"colorist"
1818
"dart-patterns-and-records"
1919
"deeplink_cookbook"
20-
"ffigen_codelab"
20+
# TODO(DomesticMouse): So, because _macros from sdk doesn't exist (could not find package _macros in the Dart SDK) and ffigen_app depends on ffigen ^16.1.0, version solving failed.
21+
# "ffigen_codelab"
2122
"firebase-auth-flutterfire-ui"
2223
"firebase-emulator-suite"
2324
"firebase-get-to-know-flutter"

forge2d_game/step_02/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.7.0-0
7+
sdk: ^3.7.2
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
1212
characters: ^1.4.0
13-
flame: ^1.24.0
14-
flame_forge2d: ^0.18.2+5
15-
flame_kenney_xml: ^0.1.1+5
13+
flame: ^1.28.0
14+
flame_forge2d: ^0.19.0
15+
flame_kenney_xml: ^0.1.1+10
1616
xml: ^6.5.0
1717

1818
dev_dependencies:

forge2d_game/step_03/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.7.0-0
7+
sdk: ^3.7.2
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
1212
characters: ^1.4.0
13-
flame: ^1.24.0
14-
flame_forge2d: ^0.18.2+5
15-
flame_kenney_xml: ^0.1.1+5
13+
flame: ^1.28.0
14+
flame_forge2d: ^0.19.0
15+
flame_kenney_xml: ^0.1.1+10
1616
xml: ^6.5.0
1717

1818
dev_dependencies:

forge2d_game/step_04/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.7.0-0
7+
sdk: ^3.7.2
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
1212
characters: ^1.4.0
13-
flame: ^1.24.0
14-
flame_forge2d: ^0.18.2+5
15-
flame_kenney_xml: ^0.1.1+5
13+
flame: ^1.28.0
14+
flame_forge2d: ^0.19.0
15+
flame_kenney_xml: ^0.1.1+10
1616
xml: ^6.5.0
1717

1818
dev_dependencies:

forge2d_game/step_05/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.7.0-0
7+
sdk: ^3.7.2
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
1212
characters: ^1.4.0
13-
flame: ^1.24.0
14-
flame_forge2d: ^0.18.2+5
15-
flame_kenney_xml: ^0.1.1+5
13+
flame: ^1.28.0
14+
flame_forge2d: ^0.19.0
15+
flame_kenney_xml: ^0.1.1+10
1616
xml: ^6.5.0
1717
equatable: ^2.0.7
1818

forge2d_game/step_06/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.7.0-0
7+
sdk: ^3.7.2
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
1212
characters: ^1.4.0
13-
flame: ^1.24.0
14-
flame_forge2d: ^0.18.2+5
15-
flame_kenney_xml: ^0.1.1+5
13+
flame: ^1.28.0
14+
flame_forge2d: ^0.19.0
15+
flame_kenney_xml: ^0.1.1+10
1616
xml: ^6.5.0
1717
equatable: ^2.0.7
1818

forge2d_game/step_07/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.7.0-0
7+
sdk: ^3.7.2
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
1212
characters: ^1.4.0
13-
flame: ^1.24.0
14-
flame_forge2d: ^0.18.2+5
15-
flame_kenney_xml: ^0.1.1+5
13+
flame: ^1.28.0
14+
flame_forge2d: ^0.19.0
15+
flame_kenney_xml: ^0.1.1+10
1616
xml: ^6.5.0
1717
equatable: ^2.0.7
1818

0 commit comments

Comments
 (0)