Skip to content

Commit 5612b8a

Browse files
Merge branch 'flutter:main' into enable-intro_flutter_gpu_attempt_2
2 parents d69677b + 6ac4dd7 commit 5612b8a

File tree

150 files changed

+7327
-1393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+7327
-1393
lines changed

.github/dependabot.yaml

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@ updates:
3030
interval: "daily"
3131
labels:
3232
- "autosubmit"
33+
- package-ecosystem: "pub"
34+
versioning-strategy: "increase-if-necessary"
35+
directory: "/animations/"
36+
schedule:
37+
interval: "daily"
38+
labels:
39+
- "autosubmit"
40+
- package-ecosystem: "pub"
41+
versioning-strategy: "increase-if-necessary"
42+
directory: "/audio_soloud/"
43+
schedule:
44+
interval: "daily"
45+
labels:
46+
- "autosubmit"
3347
- package-ecosystem: "pub"
3448
versioning-strategy: "increase-if-necessary"
3549
directory: "/boring_to_beautiful/"
@@ -39,7 +53,14 @@ updates:
3953
- "autosubmit"
4054
- package-ecosystem: "pub"
4155
versioning-strategy: "increase-if-necessary"
42-
directory: "/cupertino_store/"
56+
directory: "/brick_breaker/"
57+
schedule:
58+
interval: "daily"
59+
labels:
60+
- "autosubmit"
61+
- package-ecosystem: "pub"
62+
versioning-strategy: "increase-if-necessary"
63+
directory: "/colorist/"
4364
schedule:
4465
interval: "daily"
4566
labels:
@@ -74,14 +95,28 @@ updates:
7495
- "autosubmit"
7596
- package-ecosystem: "pub"
7697
versioning-strategy: "increase-if-necessary"
77-
directory: "/flame-building-doodle-dash/finished_game/"
98+
directory: "/firebase-emulator-suite/"
7899
schedule:
79100
interval: "daily"
80101
labels:
81102
- "autosubmit"
82103
- package-ecosystem: "pub"
83104
versioning-strategy: "increase-if-necessary"
84-
directory: "/flame-building-doodle-dash/"
105+
directory: "/firebase-get-to-know-flutter/"
106+
schedule:
107+
interval: "daily"
108+
labels:
109+
- "autosubmit"
110+
- package-ecosystem: "pub"
111+
versioning-strategy: "increase-if-necessary"
112+
directory: "/forge2d_game/"
113+
schedule:
114+
interval: "daily"
115+
labels:
116+
- "autosubmit"
117+
- package-ecosystem: "pub"
118+
versioning-strategy: "increase-if-necessary"
119+
directory: "/generate_crossword/"
85120
schedule:
86121
interval: "daily"
87122
labels:
@@ -123,21 +158,21 @@ updates:
123158
- "autosubmit"
124159
- package-ecosystem: "pub"
125160
versioning-strategy: "increase-if-necessary"
126-
directory: "/namer/"
161+
directory: "/intro_flutter_gpu/"
127162
schedule:
128163
interval: "daily"
129164
labels:
130165
- "autosubmit"
131166
- package-ecosystem: "pub"
132167
versioning-strategy: "increase-if-necessary"
133-
directory: "/next-gen-ui/"
168+
directory: "/namer/"
134169
schedule:
135170
interval: "daily"
136171
labels:
137172
- "autosubmit"
138173
- package-ecosystem: "pub"
139174
versioning-strategy: "increase-if-necessary"
140-
directory: "/star_counter/"
175+
directory: "/next-gen-ui/"
141176
schedule:
142177
interval: "daily"
143178
labels:
@@ -172,7 +207,7 @@ updates:
172207
- "autosubmit"
173208
- package-ecosystem: "pub"
174209
versioning-strategy: "increase-if-necessary"
175-
directory: "/tooling/"
210+
directory: "/tooling/codelab_rebuild/"
176211
schedule:
177212
interval: "daily"
178213
labels:

adaptive_app/step_03/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 1.0.0+1
2020

2121
environment:
22-
sdk: ^3.8.0
22+
sdk: ^3.8.1
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions
@@ -44,7 +44,7 @@ dev_dependencies:
4444
# activated in the `analysis_options.yaml` file located at the root of your
4545
# package. See that file for information about deactivating specific lint
4646
# rules and activating additional ones.
47-
flutter_lints: ^5.0.0
47+
flutter_lints: ^6.0.0
4848

4949
# For information on the generic Dart part of this file, see the
5050
# following page: https://dart.dev/tools/pub/pubspec

adaptive_app/step_04/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 1.0.0+1
2020

2121
environment:
22-
sdk: ^3.8.0
22+
sdk: ^3.8.1
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions
@@ -50,7 +50,7 @@ dev_dependencies:
5050
# activated in the `analysis_options.yaml` file located at the root of your
5151
# package. See that file for information about deactivating specific lint
5252
# rules and activating additional ones.
53-
flutter_lints: ^5.0.0
53+
flutter_lints: ^6.0.0
5454

5555
# For information on the generic Dart part of this file, see the
5656
# following page: https://dart.dev/tools/pub/pubspec

adaptive_app/step_05/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 1.0.0+1
2020

2121
environment:
22-
sdk: ^3.8.0
22+
sdk: ^3.8.1
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions
@@ -51,7 +51,7 @@ dev_dependencies:
5151
# activated in the `analysis_options.yaml` file located at the root of your
5252
# package. See that file for information about deactivating specific lint
5353
# rules and activating additional ones.
54-
flutter_lints: ^5.0.0
54+
flutter_lints: ^6.0.0
5555

5656
# For information on the generic Dart part of this file, see the
5757
# following page: https://dart.dev/tools/pub/pubspec

adaptive_app/step_06/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 1.0.0+1
2020

2121
environment:
22-
sdk: ^3.8.0
22+
sdk: ^3.8.1
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions
@@ -51,7 +51,7 @@ dev_dependencies:
5151
# activated in the `analysis_options.yaml` file located at the root of your
5252
# package. See that file for information about deactivating specific lint
5353
# rules and activating additional ones.
54-
flutter_lints: ^5.0.0
54+
flutter_lints: ^6.0.0
5555

5656
# For information on the generic Dart part of this file, see the
5757
# following page: https://dart.dev/tools/pub/pubspec

adaptive_app/step_06/yt_cors_proxy/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: A YouTube CORS Proxy Server.
33
version: 1.0.0
44

55
environment:
6-
sdk: ^3.8.0
6+
sdk: ^3.8.1
77

88
dependencies:
99
shelf: ^1.4.0

adaptive_app/step_07/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 1.0.0+1
2020

2121
environment:
22-
sdk: ^3.8.0
22+
sdk: ^3.8.1
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions
@@ -54,7 +54,7 @@ dev_dependencies:
5454
# activated in the `analysis_options.yaml` file located at the root of your
5555
# package. See that file for information about deactivating specific lint
5656
# rules and activating additional ones.
57-
flutter_lints: ^5.0.0
57+
flutter_lints: ^6.0.0
5858

5959
# For information on the generic Dart part of this file, see the
6060
# following page: https://dart.dev/tools/pub/pubspec

adaptive_app/step_07/yt_cors_proxy/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: A YouTube CORS Proxy Server.
33
version: 1.0.0
44

55
environment:
6-
sdk: ^3.8.0
6+
sdk: ^3.8.1
77

88
dependencies:
99
shelf: ^1.4.0

audio_soloud/codelab_rebuild.yaml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,22 @@ steps:
99
- name: Strip DEVELOPMENT_TEAM
1010
strip-lines-containing: DEVELOPMENT_TEAM =
1111
path: audio_soloud/ios/Runner.xcodeproj/project.pbxproj
12-
- name: Add dependencies and assets to pubspec.yaml
12+
- name: Add dependencies
13+
path: audio_soloud
14+
flutter: pub add flutter_soloud logging
15+
- name: Add assets to pubspec.yaml
1316
path: audio_soloud/pubspec.yaml
1417
patch-u: |
15-
--- a/pubspec.yaml
16-
+++ b/pubspec.yaml
17-
@@ -10,6 +10,9 @@ dependencies:
18-
flutter:
19-
sdk: flutter
20-
21-
+ flutter_soloud: ^2.1.6
22-
+ logging: ^1.2.0
23-
+
24-
dev_dependencies:
25-
flutter_test:
26-
sdk: flutter
27-
@@ -17,3 +20,7 @@ dev_dependencies:
18+
--- b/audio_soloud/step_02/pubspec.yaml
19+
+++ a/audio_soloud/step_02/pubspec.yaml
20+
@@ -19,3 +19,7 @@ dev_dependencies:
2821

2922
flutter:
3023
uses-material-design: true
3124
+
3225
+ assets:
3326
+ - assets/music/
3427
+ - assets/sounds/
35-
36-
- name: Update dependencies
37-
path: audio_soloud
38-
flutter: pub upgrade --major-versions
39-
4028
- name: Update iOS deployment target
4129
path: audio_soloud/ios/Podfile
4230
patch-u: |

audio_soloud/step_02/pubspec.yaml

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

66
environment:
7-
sdk: ^3.8.0
7+
sdk: ^3.8.1
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
12-
1312
flutter_soloud: ^3.1.10
14-
logging: ^1.2.0
13+
logging: ^1.3.0
1514

1615
dev_dependencies:
1716
flutter_test:

0 commit comments

Comments
 (0)