Skip to content

Commit a858f47

Browse files
authored
Bump deps and min SDKs, move web apps to new bootstrapping logic (#2292)
Also removed the web measurement experiment from the material 3 demo
1 parent 4776ad5 commit a858f47

File tree

83 files changed

+90
-556
lines changed

Some content is hidden

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

83 files changed

+90
-556
lines changed

Diff for: add_to_app/android_view/flutter_module_using_plugin/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An example Flutter module that uses a plugin.
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
flutter:

Diff for: add_to_app/books/flutter_module_books/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: A Flutter module using the Pigeon package to demonstrate
66
version: 1.0.0+1
77

88
environment:
9-
sdk: ^3.3.1
9+
sdk: ^3.4.0-0
1010

1111
dependencies:
1212
flutter:

Diff for: add_to_app/fullscreen/flutter_module/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An example Flutter module.
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
flutter:

Diff for: add_to_app/multiple_flutters/multiple_flutters_module/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A module that is embedded in the multiple_flutters_ios and multiple
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
flutter:

Diff for: add_to_app/plugin/flutter_module_using_plugin/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An example Flutter module that uses a plugin.
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
flutter:

Diff for: add_to_app/prebuilt_module/flutter_module/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An example Flutter module.
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
flutter:

Diff for: ai_recipe_generation/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: '>=3.2.3 <4.0.0'
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
async: ^2.11.0
@@ -18,7 +18,7 @@ dependencies:
1818
flutter_markdown: ^0.6.20
1919
flutter_svg: ^2.0.9
2020
google_fonts: 6.1.0
21-
google_generative_ai: ^0.2.0
21+
google_generative_ai: ^0.4.0
2222
image_picker: ^1.0.7
2323
material_symbols_icons: ^4.2719.1
2424
path: ^1.9.0

Diff for: ai_recipe_generation/web/index.html

+1-22
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,8 @@
3131

3232
<title>gemini_io_talk</title>
3333
<link rel="manifest" href="manifest.json">
34-
35-
<script>
36-
// The value below is injected by flutter build, do not touch.
37-
const serviceWorkerVersion = null;
38-
</script>
39-
<!-- This script adds the flutter initialization JS code -->
40-
<script src="flutter.js" defer></script>
4134
</head>
4235
<body>
43-
<script>
44-
window.addEventListener('load', function(ev) {
45-
// Download main.dart.js
46-
_flutter.loader.loadEntrypoint({
47-
serviceWorker: {
48-
serviceWorkerVersion: serviceWorkerVersion,
49-
},
50-
onEntrypointLoaded: function(engineInitializer) {
51-
engineInitializer.initializeEngine().then(function(appRunner) {
52-
appRunner.runApp();
53-
});
54-
}
55-
});
56-
});
57-
</script>
36+
<script src="flutter_bootstrap.js" async></script>
5837
</body>
5938
</html>

Diff for: analysis_defaults/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Analysis defaults for flutter/samples
33
publish_to: none
44

55
environment:
6-
sdk: ^3.3.1
6+
sdk: ^3.4.0-0
77

88
# NOTE: Code is not allowed in this package. Do not add more dependencies.
99
# The `flutter_lints` dependency is required for `lib/flutter.yaml`.

Diff for: android_splash_screen/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish_to: "none"
66
version: 1.0.0+1
77

88
environment:
9-
sdk: ^3.3.1
9+
sdk: ^3.4.0-0
1010

1111
dependencies:
1212
flutter:

Diff for: animations/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0+1
44
publish_to: none
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
flutter:

Diff for: animations/web/index.html

+1-22
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,8 @@
3131

3232
<title>animations</title>
3333
<link rel="manifest" href="manifest.json">
34-
35-
<script>
36-
// The value below is injected by flutter build, do not touch.
37-
const serviceWorkerVersion = null;
38-
</script>
39-
<!-- This script adds the flutter initialization JS code -->
40-
<script src="flutter.js" defer></script>
4134
</head>
4235
<body>
43-
<script>
44-
window.addEventListener('load', function(ev) {
45-
// Download main.dart.js
46-
_flutter.loader.loadEntrypoint({
47-
serviceWorker: {
48-
serviceWorkerVersion: serviceWorkerVersion,
49-
},
50-
onEntrypointLoaded: function(engineInitializer) {
51-
engineInitializer.initializeEngine().then(function(appRunner) {
52-
appRunner.runApp();
53-
});
54-
}
55-
});
56-
});
57-
</script>
36+
<script src="flutter_bootstrap.js" async></script>
5837
</body>
5938
</html>

Diff for: asset_transformation/grayscale_transformer/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ description: A sample command-line application.
33
version: 1.0.0
44

55
environment:
6-
sdk: ^3.3.1
6+
sdk: ^3.4.0-0
77

88
dependencies:
99
args: ^2.4.2
1010
image: ^4.1.7
1111

1212
dev_dependencies:
13-
lints: ^3.0.0
13+
lints: ^4.0.0
1414
test: ^1.24.0

Diff for: asset_transformation/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: 'none'
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
flutter:
@@ -14,7 +14,7 @@ dependencies:
1414
dev_dependencies:
1515
flutter_test:
1616
sdk: flutter
17-
flutter_lints: ^3.0.0
17+
flutter_lints: ^4.0.0
1818
vector_graphics_compiler: ^1.1.11+1
1919
grayscale_transformer:
2020
path: ./grayscale_transformer

Diff for: background_isolate_channels/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
66
version: 1.0.0+1
77

88
environment:
9-
sdk: ^3.3.1
9+
sdk: ^3.4.0-0
1010

1111
dependencies:
1212
cupertino_icons: ^1.0.2

Diff for: code_sharing/client/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: "none"
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
cupertino_icons: ^1.0.2

Diff for: code_sharing/client/web/index.html

+1-22
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,8 @@
3131

3232
<title>client</title>
3333
<link rel="manifest" href="manifest.json">
34-
35-
<script>
36-
// The value below is injected by flutter build, do not touch.
37-
var serviceWorkerVersion = null;
38-
</script>
39-
<!-- This script adds the flutter initialization JS code -->
40-
<script src="flutter.js" defer></script>
4134
</head>
4235
<body>
43-
<script>
44-
window.addEventListener('load', function(ev) {
45-
// Download main.dart.js
46-
_flutter.loader.loadEntrypoint({
47-
serviceWorker: {
48-
serviceWorkerVersion: serviceWorkerVersion,
49-
},
50-
onEntrypointLoaded: function(engineInitializer) {
51-
engineInitializer.initializeEngine().then(function(appRunner) {
52-
appRunner.runApp();
53-
});
54-
}
55-
});
56-
});
57-
</script>
36+
<script src="flutter_bootstrap.js" async></script>
5837
</body>
5938
</html>

Diff for: code_sharing/server/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0
44
publish_to: "none"
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
args: ^2.0.0

Diff for: code_sharing/shared/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Common data models required by our client and server
33
version: 1.0.0
44

55
environment:
6-
sdk: ^3.3.1
6+
sdk: ^3.4.0-0
77

88
dependencies:
99
freezed_annotation: ^2.1.0

Diff for: context_menus/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
2020
version: 1.0.0+1
2121

2222
environment:
23-
sdk: ^3.3.1
23+
sdk: ^3.4.0-0
2424

2525
# Dependencies specify other packages that your package needs in order to work.
2626
# To automatically upgrade your package dependencies to the latest versions

Diff for: context_menus/web/index.html

+1-22
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,8 @@
3131

3232
<title>context_menus</title>
3333
<link rel="manifest" href="manifest.json">
34-
35-
<script>
36-
// The value below is injected by flutter build, do not touch.
37-
var serviceWorkerVersion = null;
38-
</script>
39-
<!-- This script adds the flutter initialization JS code -->
40-
<script src="flutter.js" defer></script>
4134
</head>
4235
<body>
43-
<script>
44-
window.addEventListener('load', function(ev) {
45-
// Download main.dart.js
46-
_flutter.loader.loadEntrypoint({
47-
serviceWorker: {
48-
serviceWorkerVersion: serviceWorkerVersion,
49-
},
50-
onEntrypointLoaded: function(engineInitializer) {
51-
engineInitializer.initializeEngine().then(function(appRunner) {
52-
appRunner.runApp();
53-
});
54-
}
55-
});
56-
});
57-
</script>
36+
<script src="flutter_bootstrap.js" async></script>
5837
</body>
5938
</html>

Diff for: deeplink_store_example/pubspec.yaml

+1-1
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.3.1
22+
sdk: ^3.4.0-0
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

Diff for: deeplink_store_example/web/index.html

+1-22
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,8 @@
3131

3232
<title>deeplink_store_example</title>
3333
<link rel="manifest" href="manifest.json">
34-
35-
<script>
36-
// The value below is injected by flutter build, do not touch.
37-
var serviceWorkerVersion = null;
38-
</script>
39-
<!-- This script adds the flutter initialization JS code -->
40-
<script src="flutter.js" defer></script>
4134
</head>
4235
<body>
43-
<script>
44-
window.addEventListener('load', function(ev) {
45-
// Download main.dart.js
46-
_flutter.loader.loadEntrypoint({
47-
serviceWorker: {
48-
serviceWorkerVersion: serviceWorkerVersion,
49-
},
50-
onEntrypointLoaded: function(engineInitializer) {
51-
engineInitializer.initializeEngine().then(function(appRunner) {
52-
appRunner.runApp();
53-
});
54-
}
55-
});
56-
});
57-
</script>
36+
<script src="flutter_bootstrap.js" async></script>
5837
</body>
5938
</html>

Diff for: desktop_photo_search/fluent_ui/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: 'none'
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
built_collection: ^5.1.1

Diff for: desktop_photo_search/material/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: 'none'
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.3.1
7+
sdk: ^3.4.0-0
88

99
dependencies:
1010
built_collection: ^5.1.1

Diff for: dynamic_theme/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ dependencies:
99
flutter:
1010
sdk: flutter
1111
flutter_markdown: ^0.7.1
12-
google_generative_ai: ^0.3.3
12+
google_generative_ai: ^0.4.0
1313
url_launcher: ^6.2.6
1414

1515
dev_dependencies:
1616
flutter_test:
1717
sdk: flutter
18-
flutter_lints: ^3.0.0
18+
flutter_lints: ^4.0.0
1919

2020
flutter:
2121
uses-material-design: true

0 commit comments

Comments
 (0)