Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Flutter 3.10 beta #1746

Merged
merged 56 commits into from
May 10, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
fb798c7
Add `unnecessary_breaks` lint (#1709)
domesticmouse Apr 26, 2023
ae6df34
Merge branch 'master' of https://github.com/flutter/samples into beta
domesticmouse Apr 26, 2023
9b7dc57
Update `animations` Runners
domesticmouse Apr 26, 2023
18b1768
Update `desktop_photo_search` runners
domesticmouse Apr 26, 2023
da70765
Merge branch 'main' of https://github.com/flutter/samples into beta
domesticmouse May 2, 2023
3de23dd
Update CI
domesticmouse May 2, 2023
4dd7982
Merge branch 'main' of https://github.com/flutter/samples into beta
domesticmouse May 2, 2023
10ccb00
Fixup `code_sharing`
domesticmouse May 2, 2023
5016121
Format `deeplink_store_example`
domesticmouse May 2, 2023
e7ae35e
Format `experimental/material3_demo`
domesticmouse May 2, 2023
a679e5b
`const` migration
domesticmouse May 2, 2023
bc667f4
Elide `federated_plugin` from CI
domesticmouse May 2, 2023
6c422af
Merge branch 'main' of https://github.com/flutter/samples into beta
domesticmouse May 2, 2023
1f04236
Merge branch 'beta' of https://github.com/flutter/samples into beta
domesticmouse May 2, 2023
7bdb377
Elide `experimental/context_menus` from master CI
domesticmouse May 2, 2023
bb0cfb3
Pull `experimental/material_3_demo` from CI
domesticmouse May 2, 2023
bc3884f
Elide `material_3_demo` from `master` and `beta` CI
domesticmouse May 2, 2023
d33978b
More elides
domesticmouse May 2, 2023
cf0c491
Update `simplistic_calculator`
domesticmouse May 2, 2023
3055c15
`sdk: ^3.0.0-0`
domesticmouse May 2, 2023
1079dc2
Drop `break`s
domesticmouse May 2, 2023
89a6e9b
Drop moar `break`s
domesticmouse May 2, 2023
b0b804d
Yet more `break`s
domesticmouse May 2, 2023
8cdfa48
Elide `experimental/pedometer`
domesticmouse May 2, 2023
9186be7
Fixup `deeplink_store_example`
domesticmouse May 2, 2023
57f25e8
Update CI project list
domesticmouse May 2, 2023
1221a76
Mark up Flutter 3.10 beta breakages with tracking issues
domesticmouse May 2, 2023
abac89d
whups
domesticmouse May 2, 2023
2a49320
`dart run ffigen --config ffigen.yaml`
domesticmouse May 2, 2023
d5b4342
Update `experimental/pedometer`'s `ffigen` version
domesticmouse May 2, 2023
13086d0
`window` singleton fix
domesticmouse May 2, 2023
cb17c4a
Copy `experimental/material_3_demo` over `material_3_demo`
domesticmouse May 2, 2023
db0efb9
Add back CI
domesticmouse May 2, 2023
39d8f67
Fixup `material_3_demo`
domesticmouse May 2, 2023
f7c0337
Update `experimental/pedometer`
domesticmouse May 2, 2023
8b311f2
[web] Move embedding example out of experimental. (#1763)
ditman May 3, 2023
eb75bf5
`experimental/pedometer` Update `ffigen` to 8.0.0
domesticmouse May 3, 2023
1307ed3
`experimental/pedometer`: Update `jnigen` to 0.4.0
domesticmouse May 3, 2023
3fffaff
Fixup `federated_plugin` and friends
domesticmouse May 3, 2023
7e2c507
`platform_channels`: partial port
domesticmouse May 3, 2023
507dd1b
Merge branch 'main' into beta
domesticmouse May 3, 2023
64ea2ae
[web] Publish ng-flutter example. (#1773)
ditman May 3, 2023
0104204
Merge branch 'master' of https://github.com/flutter/samples into beta
domesticmouse May 6, 2023
049743b
Update deeplink_store_example to Dart 3 (#1789)
johnpryan May 9, 2023
185b332
Update flutter_maps_firestore to Dart 3 (#1792)
johnpryan May 9, 2023
6b80a89
Update form_app to Dart 3 (#1790)
johnpryan May 9, 2023
d50bd44
Update isolate_example to Dart 3 (#1794)
johnpryan May 9, 2023
7e3e2ad
Update animations to Dart 3 (#1788)
johnpryan May 9, 2023
6070c8c
Update simplistic_calculator to Dart 3 (#1799)
johnpryan May 9, 2023
1bd83a3
Update platform_design to Dart 3 (#1798)
johnpryan May 9, 2023
81bf715
Update platform_channels to Dart 3 (#1797)
johnpryan May 9, 2023
9bc072d
Update place_tracker to Dart 3 (#1796)
johnpryan May 9, 2023
2a5068d
Update infinite_list to Dart 3 (#1793)
johnpryan May 9, 2023
5a47cfa
Merge branch 'master' of https://github.com/flutter/samples into beta
domesticmouse May 9, 2023
afc3736
Drop `experimental/element_embedding_demo`
domesticmouse May 9, 2023
96301ae
`dart format`
domesticmouse May 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions analysis_defaults/lib/flutter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ linter:
test_types_in_equals: true
throw_in_finally: true
unawaited_futures: true
unnecessary_breaks: true
unnecessary_statements: true
use_super_parameters: true
2 changes: 1 addition & 1 deletion analysis_defaults/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Analysis defaults for flutter/samples
publish_to: none

environment:
sdk: '>=2.19.5 <4.0.0'
sdk: ^3.0.0-0

# NOTE: Code is not allowed in this package. Do not add dependencies.
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion android_splash_screen/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: '>=2.19.5 <4.0.0'
sdk: ^3.0.0-0

dependencies:
flutter:
Expand Down
30 changes: 15 additions & 15 deletions animations/.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file should be version controlled.

version:
revision: f732038a8cf4562ce38a1d7debb30209ae3da896
revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
channel: beta

project_type: app
Expand All @@ -13,26 +13,26 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: android
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: ios
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: linux
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: macos
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: web
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: windows
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd

# User provided section

Expand Down
1 change: 1 addition & 0 deletions animations/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "dev.flutter.animations"
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

Expand Down
3 changes: 1 addition & 2 deletions animations/android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="dev.flutter.animations">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
3 changes: 1 addition & 2 deletions animations/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="dev.flutter.animations">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:label="animations"
android:name="${applicationName}"
Expand Down
3 changes: 1 addition & 2 deletions animations/android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="dev.flutter.animations">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
2 changes: 1 addition & 1 deletion animations/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
2 changes: 1 addition & 1 deletion animations/macos/Runner/MainFlutterWindow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import FlutterMacOS

class MainFlutterWindow: NSWindow {
override func awakeFromNib() {
let flutterViewController = FlutterViewController.init()
let flutterViewController = FlutterViewController()
let windowFrame = self.frame
self.contentViewController = flutterViewController
self.setFrame(windowFrame, display: true)
Expand Down
2 changes: 1 addition & 1 deletion animations/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0+1
publish_to: none

environment:
sdk: '>=2.19.5 <4.0.0'
sdk: ^3.0.0-0

dependencies:
flutter:
Expand Down
7 changes: 0 additions & 7 deletions background_isolate_channels/lib/simple_database.dart
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,12 @@ class SimpleDatabase {
RootIsolateToken rootIsolateToken = RootIsolateToken.instance!;
_sendPort
.send(_Command(_Codes.init, arg0: _path, arg1: rootIsolateToken));
break;
case _Codes.ack:
_completers.removeLast().complete();
break;
case _Codes.result:
_resultsStream.last.add(command.arg0 as String);
break;
case _Codes.done:
_resultsStream.removeLast().close();
break;
default:
debugPrint('SimpleDatabase unrecognized command: ${command.code}');
}
Expand Down Expand Up @@ -198,13 +194,10 @@ class _SimpleDatabaseServer {
// ----------------------------------------------------------------------
BackgroundIsolateBinaryMessenger.ensureInitialized(rootIsolateToken);
_sendPort.send(const _Command(_Codes.ack, arg0: null));
break;
case _Codes.add:
_doAddEntry(command.arg0 as String);
break;
case _Codes.query:
_doFind(command.arg0 as String);
break;
default:
debugPrint(
'_SimpleDatabaseServer unrecognized command ${command.code}');
Expand Down
2 changes: 1 addition & 1 deletion background_isolate_channels/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=2.19.5 <4.0.0'
sdk: ^3.0.0-0

dependencies:
cupertino_icons: ^1.0.2
Expand Down
4 changes: 2 additions & 2 deletions code_sharing/client/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ class _MyHomePageState extends State<MyHomePage> {
),
if (isWriting) ...[
const SizedBox(height: 10),
Row(
const Row(
mainAxisAlignment: MainAxisAlignment.center,
children: const <Widget>[
children: <Widget>[
Text(
'Communicating with server...',
style: TextStyle(fontSize: 32, color: Colors.blue),
Expand Down
2 changes: 1 addition & 1 deletion code_sharing/client/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: '>=2.19.5 <4.0.0'
sdk: ^3.0.0-0

dependencies:
cupertino_icons: ^1.0.2
Expand Down
2 changes: 1 addition & 1 deletion code_sharing/server/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
publish_to: "none"

environment:
sdk: '>=2.19.5 <4.0.0'
sdk: ^3.0.0-0

dependencies:
args: ^2.0.0
Expand Down
2 changes: 1 addition & 1 deletion code_sharing/shared/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Common data models required by our client and server
version: 1.0.0

environment:
sdk: '>=2.19.5 <4.0.0'
sdk: ^3.0.0-0

dependencies:
freezed_annotation: ^2.1.0
Expand Down
10 changes: 7 additions & 3 deletions deeplink_store_example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,18 @@ class MyApp extends StatelessWidget {
debugShowCheckedModeBanner: false,
routerConfig: GoRouter(
routes: [
GoRoute(path: '/', builder: (_, __) => const ProductList(),
GoRoute(
path: '/',
builder: (_, __) => const ProductList(),
routes: [
GoRoute(path: ':id', builder: (_, __) => const ProductDetails()),
],
),
GoRoute(path: '/category/:category', builder: (_, __) => const ProductCategoryList()),
GoRoute(
path: '/category/:category',
builder: (_, __) => const ProductCategoryList()),
],
),
);
}
}
}
2 changes: 1 addition & 1 deletion deeplink_store_example/lib/model/products_repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class ProductsRepository {
}

String getCategoryTitle(Category category) {
switch(category) {
switch (category) {
case Category.all:
return 'All';
case Category.accessories:
Expand Down
13 changes: 8 additions & 5 deletions deeplink_store_example/lib/product_category_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,21 @@ class ProductCategoryList extends StatelessWidget {
Widget build(BuildContext context) {
final GoRouterState state = GoRouterState.of(context);
final Category category = Category.values.firstWhere(
(Category value) => value.toString().contains(state.params['category']!),
(Category value) =>
value.toString().contains(state.pathParameters['category']!),
orElse: () => Category.all,
);
final List<Widget> children = ProductsRepository.loadProducts(category: category)
.map<Widget>((Product p) => RowItem(product: p))
.toList();
final List<Widget> children =
ProductsRepository.loadProducts(category: category)
.map<Widget>((Product p) => RowItem(product: p))
.toList();
return Scaffold(
backgroundColor: Styles.scaffoldBackground,
body: CustomScrollView(
slivers: <Widget>[
SliverAppBar(
title: Text(getCategoryTitle(category), style: Styles.productListTitle),
title: Text(getCategoryTitle(category),
style: Styles.productListTitle),
backgroundColor: Styles.scaffoldAppBarBackground,
pinned: true,
),
Expand Down
9 changes: 5 additions & 4 deletions deeplink_store_example/lib/product_details.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ class ProductDetails extends StatelessWidget {

@override
Widget build(BuildContext context) {
final String currentId = GoRouterState.of(context).params['id']!;
final Product product = ProductsRepository.loadProduct(id: int.parse(currentId));
final String currentId = GoRouterState.of(context).pathParameters['id']!;
final Product product =
ProductsRepository.loadProduct(id: int.parse(currentId));
return Scaffold(
body: ListView(
children: <Widget>[
Expand All @@ -40,7 +41,7 @@ class ProductDetails extends StatelessWidget {
}
}

class ProductPicture extends StatelessWidget{
class ProductPicture extends StatelessWidget {
const ProductPicture({super.key, required this.product});

final Product product;
Expand All @@ -63,4 +64,4 @@ class ProductPicture extends StatelessWidget{
],
);
}
}
}
4 changes: 2 additions & 2 deletions deeplink_store_example/lib/product_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class ProductList extends StatelessWidget {
@override
Widget build(BuildContext context) {
final List<Widget> children = ProductsRepository.loadProducts()
.map<Widget>((Product p) => RowItem(product: p))
.toList();
.map<Widget>((Product p) => RowItem(product: p))
.toList();
return Scaffold(
backgroundColor: Styles.scaffoldBackground,
body: CustomScrollView(
Expand Down
4 changes: 2 additions & 2 deletions deeplink_store_example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=3.0.0-290.0.dev <4.0.0'
sdk: ^3.0.0-0

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand All @@ -36,7 +36,7 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.2
shrine_images: ^2.0.2
go_router: ^6.5.5
go_router: ^7.0.0

dev_dependencies:
flutter_test:
Expand Down
20 changes: 10 additions & 10 deletions desktop_photo_search/fluent_ui/.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
# This file should be version controlled.

version:
revision: 9944297138845a94256f1cf37beb88ff9a8e811a
channel: stable
revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
channel: beta

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: linux
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: macos
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
- platform: windows
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd

# User provided section

Expand Down
1 change: 1 addition & 0 deletions desktop_photo_search/fluent_ui/linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ set_target_properties(${BINARY_NAME}
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
)


# Generated plugin build rules, which manage building the plugins and adding
# them to the application.
include(flutter/generated_plugins.cmake)
Expand Down
3 changes: 3 additions & 0 deletions desktop_photo_search/fluent_ui/macos/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ target 'Runner' do
use_modular_headers!

flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
inherit! :search_paths
end
end

post_install do |installer|
Expand Down
Loading