Skip to content

Commit 396e78f

Browse files
Merge branch 'fix/_floatingActionButtonVisibilityValue-update' of https://github.com/hello-coder-xu/flutter into fix/_floatingActionButtonVisibilityValue-update
* 'fix/_floatingActionButtonVisibilityValue-update' of https://github.com/hello-coder-xu/flutter: fix: update _floatingActionButtonVisibility only if floatingActionButton is not null [wiki migration] Remaining pages under docs/about/ (flutter#148782) Roll Flutter Engine from b6971cdf14f8 to 8b094fbb94d8 (3 revisions) (flutter#148883) Fix the second TextFormField to trigger onTapOutside (flutter#148206) Try removing robolectric from `integration_test` tests (flutter#148803) Prevent test folder deletion on running `flutter create --empty` on an existing app project (flutter#147160) [wiki migration] Tool team pages (flutter#148779) Roll Flutter Engine from c89defa55801 to b6971cdf14f8 (6 revisions) (flutter#148819) [native_assets] Add support for link hooks (flutter#148474) Roll Packages from ba19b24 to 6525441 (12 revisions) (flutter#148864) Update tokens to 4.0.0 (flutter#148789) Move Linux web_long_running_tests_2_5 to bringup (flutter#148854) `CupertinoDialogRoute` leak fix (flutter#148774) Marks Windows plugin_test to be flaky (flutter#148835)
2 parents e09a2a2 + 05ce0ce commit 396e78f

File tree

125 files changed

+1721
-1202
lines changed

Some content is hidden

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

125 files changed

+1721
-1202
lines changed

.ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,7 @@ targets:
12941294

12951295
- name: Linux web_long_running_tests_2_5
12961296
recipe: flutter/flutter_drone
1297+
bringup: true
12971298
timeout: 60
12981299
properties:
12991300
dependencies: >-
@@ -5455,6 +5456,7 @@ targets:
54555456
- .ci.yaml
54565457

54575458
- name: Windows plugin_test
5459+
bringup: true # Flaky https://github.com/flutter/flutter/issues/148834
54585460
recipe: devicelab/devicelab_drone
54595461
timeout: 60
54605462
properties:

.github/labeler.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ framework:
118118
- packages/flutter_test/**/*
119119
- packages/integration_test/**/*
120120
- examples/api/**/*
121+
- docs/about/**/*
121122
- docs/contributing/**/*
122123
- docs/libraries/**/*
123124

@@ -161,6 +162,7 @@ platform-web:
161162
team:
162163
- changed-files:
163164
- any-glob-to-any-file:
165+
- docs/about/**/*
164166
- docs/postmortems/**/*
165167

166168
team-android:
@@ -188,8 +190,14 @@ team-release:
188190
- any-glob-to-any-file:
189191
- docs/releases/**/*
190192

193+
team-tool:
194+
- changed-files:
195+
- any-glob-to-any-file:
196+
- docs/tool/**/*
197+
191198
tool:
192199
- changed-files:
193200
- any-glob-to-any-file:
194201
- packages/flutter_tools/**/*
195202
- packages/fuchsia_remote_debug_protocol/**/*
203+
- docs/tool/**/*

bin/internal/engine.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c89defa558013d7790ab0fec0819c30fccae3aba
1+
8b094fbb94d83fa1dfdde4598c5ff76f6147f5cc

bin/internal/flutter_packages.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ba19b247d0bad15feed2ae31248b52ec0cf19785
1+
65254411e6773cdc97c5b091c07856b52f9965c9

bin/internal/fuchsia-linux.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
HHwlAJN5imwf3yX4i6DhvMFhgYzp7YIXIsEYuvsx9JEC
1+
gWBn6yPljFeQvPSYzbUxDIPoVDr4670EVgEfGrmfdl0C

dev/bots/analyze.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,6 +1308,7 @@ Future<void> verifyRepositoryLinks(String workingDirectory) async {
13081308
'chromium/chromium',
13091309
'clojure/clojure',
13101310
'dart-lang/test', // TODO(guidezpl): remove when https://github.com/dart-lang/test/issues/2209 is closed
1311+
'dart-lang/webdev',
13111312
'eseidelGoogle/bezier_perf',
13121313
'flutter/devtools', // TODO(guidezpl): remove when https://github.com/flutter/devtools/issues/7551 is closed
13131314
'flutter/flutter_gallery_assets', // TODO(guidezpl): remove when subtask in https://github.com/flutter/flutter/issues/121564 is complete
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
6+
.DS_Store
7+
.atom/
8+
.buildlog/
9+
.history
10+
.svn/
11+
migrate_working_dir/
12+
13+
# IntelliJ related
14+
*.iml
15+
*.ipr
16+
*.iws
17+
.idea/
18+
19+
# The .vscode folder contains launch configuration and tasks you configure in
20+
# VS Code which you may wish to be included in version control, so this line
21+
# is commented out by default.
22+
#.vscode/
23+
24+
# Flutter/Dart/Pub related
25+
# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
26+
/pubspec.lock
27+
**/doc/api/
28+
.dart_tool/
29+
.packages
30+
build/
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# link_hook
2+
3+
Test project for the native assets test to exercise adding assets during a link hook.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Run with `dart run ffigen --config ffigen.yaml`.
2+
name: LinkHookBindings
3+
description: |
4+
Bindings for `src/link_hook.h`.
5+
6+
Regenerate bindings with `dart run ffigen --config ffigen.yaml`.
7+
output: 'lib/link_hook_bindings_generated.dart'
8+
headers:
9+
entry-points:
10+
- 'src/link_hook.h'
11+
include-directives:
12+
- 'src/link_hook.h'
13+
ffi-native:
14+
preamble: |
15+
// ignore_for_file: always_specify_types
16+
// ignore_for_file: camel_case_types
17+
// ignore_for_file: non_constant_identifier_names
18+
comments:
19+
style: any
20+
length: full
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import 'package:logging/logging.dart';
6+
import 'package:native_assets_cli/native_assets_cli.dart';
7+
import 'package:native_toolchain_c/native_toolchain_c.dart';
8+
9+
10+
void main(List<String> args) async {
11+
await build(args, (BuildConfig config, BuildOutput output) async {
12+
final String packageName = config.packageName;
13+
final CBuilder cbuilder = CBuilder.library(
14+
name: packageName,
15+
assetName: 'some_asset_name_that_is_not_used',
16+
sources: <String>[
17+
'src/$packageName.c',
18+
],
19+
dartBuildFiles: <String>['hook/build.dart'],
20+
);
21+
final BuildOutput outputCatcher = BuildOutput();
22+
await cbuilder.run(
23+
buildConfig: config,
24+
buildOutput: outputCatcher,
25+
logger: Logger('')
26+
..level = Level.ALL
27+
..onRecord.listen((LogRecord record) => print(record.message)),
28+
);
29+
output.addDependencies(outputCatcher.dependencies);
30+
// Send the asset to hook/link.dart.
31+
output.addAsset(
32+
outputCatcher.assets.single,
33+
linkInPackage: 'link_hook',
34+
);
35+
});
36+
}

0 commit comments

Comments
 (0)