Skip to content

Commit 4a65a76

Browse files
guidezplguidezpl
authored
Reland: Update link branches to main (#146882)
Reland flutter/flutter#146558, reverted in flutter/flutter#146880 due to an outdated test result ## Original description - Update CS and googlesource.com link branches - Update GitHub /blob/ and /tree/ links Tested links manually and fixes a few broken or deprecated links Added a test that validates that `master` isn't used, except for specified repos. Part of flutter/flutter#121564
1 parent f5815f9 commit 4a65a76

File tree

42 files changed

+120
-55
lines changed

Some content is hidden

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

42 files changed

+120
-55
lines changed

‎.github/workflows/easy-cp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
# TODO(xilaizhang): remove this step once the template is available on release branches.
5454
- name: Get CP Template
5555
run: |
56-
curl -o PULL_REQUEST_CP_TEMPLATE.md https://raw.githubusercontent.com/flutter/flutter/master/.github/PR_TEMPLATE/PULL_REQUEST_CP_TEMPLATE.md
56+
curl -o PULL_REQUEST_CP_TEMPLATE.md https://raw.githubusercontent.com/flutter/flutter/main/.github/PR_TEMPLATE/PULL_REQUEST_CP_TEMPLATE.md
5757
- name: Create PR on CP success
5858
if: ${{ steps.attempt-cp.conclusion == 'success' }}
5959
working-directory: ./flutter

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ open source.
2525
* [Install Flutter](https://flutter.dev/get-started/)
2626
* [Flutter documentation](https://docs.flutter.dev/)
2727
* [Development wiki](https://github.com/flutter/flutter/wiki)
28-
* [Contributing to Flutter](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md)
28+
* [Contributing to Flutter](https://github.com/flutter/flutter/blob/main/CONTRIBUTING.md)
2929

3030
For announcements about new releases, follow the
3131
[[email protected]](https://groups.google.com/forum/#!forum/flutter-announce)
@@ -121,5 +121,5 @@ Information on how to get started can be found in our
121121
[macOS FFI]: https://docs.flutter.dev/development/platform-integration/macos/c-interop
122122
[Windows FFI]: https://docs.flutter.dev/development/platform-integration/windows/building#integrating-with-windows
123123
[platform channels]: https://docs.flutter.dev/development/platform-integration/platform-channels
124-
[interop example]: https://github.com/flutter/flutter/tree/master/examples/platform_channel
124+
[interop example]: https://github.com/flutter/flutter/tree/main/examples/platform_channel
125125
[Impeller]: https://docs.flutter.dev/perf/impeller

‎dev/bots/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ actions through `recipe_modules`. Searching the builder config in [infra](https:
6161
will indicate the recipe used for a test.
6262

6363
Recipes are just Python with some limitations on what can be imported. They are
64-
[documented](https://github.com/luci/recipes-py/blob/master/doc/user_guide.md)
64+
[documented](https://github.com/luci/recipes-py/blob/main/doc/user_guide.md)
6565
by the [luci/recipes-py GitHub project](https://github.com/luci/recipes-py).
6666

6767
The typical cycle for editing a recipe is:

‎dev/bots/analyze.dart

Lines changed: 68 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@ Future<void> run(List<String> arguments) async {
109109
printProgress('Debug mode instead of checked mode...');
110110
await verifyNoCheckedMode(flutterRoot);
111111

112-
printProgress('Links for creating GitHub issues');
112+
printProgress('Links for creating GitHub issues...');
113113
await verifyIssueLinks(flutterRoot);
114114

115+
printProgress('Links to repositories...');
116+
await verifyRepositoryLinks(flutterRoot);
117+
115118
printProgress('Unexpected binaries...');
116119
await verifyNoBinaries(flutterRoot);
117120

@@ -471,7 +474,7 @@ Future<void> verifyMaterialFilesAreUpToDateWithTemplateFiles(String workingDirec
471474
if (errors.isNotEmpty) {
472475
foundError(<String>[
473476
...errors,
474-
'${bold}See: https://github.com/flutter/flutter/blob/master/dev/tools/gen_defaults to update the token template files.$reset',
477+
'${bold}See: https://github.com/flutter/flutter/blob/main/dev/tools/gen_defaults to update the token template files.$reset',
475478
]);
476479
}
477480
}
@@ -1220,7 +1223,7 @@ String _bullets(String value) => ' * $value';
12201223
Future<void> verifyIssueLinks(String workingDirectory) async {
12211224
const String issueLinkPrefix = 'https://github.com/flutter/flutter/issues/new';
12221225
const Set<String> stops = <String>{ '\n', ' ', "'", '"', r'\', ')', '>' };
1223-
assert(!stops.contains('.')); // instead of "visit https://foo." say "visit: https://", it copy-pastes better
1226+
assert(!stops.contains('.')); // instead of "visit https://foo." say "visit: https://foo", it copy-pastes better
12241227
const String kGiveTemplates =
12251228
'Prefer to provide a link either to $issueLinkPrefix/choose (the list of issue '
12261229
'templates) or to a specific template directly ($issueLinkPrefix?template=...).\n';
@@ -1291,6 +1294,68 @@ Future<void> verifyIssueLinks(String workingDirectory) async {
12911294
}
12921295
}
12931296

1297+
Future<void> verifyRepositoryLinks(String workingDirectory) async {
1298+
const Set<String> stops = <String>{ '\n', ' ', "'", '"', r'\', ')', '>' };
1299+
assert(!stops.contains('.')); // instead of "visit https://foo." say "visit: https://foo", it copy-pastes better
1300+
1301+
// Repos whose default branch is still 'master'
1302+
const Set<String> repoExceptions = <String>{
1303+
'clojure/clojure',
1304+
'dart-lang/test', // TODO(guidezpl): remove when https://github.com/dart-lang/test/issues/2209 is closed
1305+
'eseidelGoogle/bezier_perf',
1306+
'flutter/devtools', // TODO(guidezpl): remove when https://github.com/flutter/devtools/issues/7551 is closed
1307+
'flutter/flutter_gallery_assets', // TODO(guidezpl): remove when subtask in https://github.com/flutter/flutter/issues/121564 is complete
1308+
'flutter/flutter-intellij', // TODO(guidezpl): remove when https://github.com/flutter/flutter-intellij/issues/7342 is closed
1309+
'flutter/platform_tests', // TODO(guidezpl): remove when subtask in https://github.com/flutter/flutter/issues/121564 is complete
1310+
'glfw/glfw',
1311+
'material-components/material-components-android', // TODO(guidezpl): remove when https://github.com/material-components/material-components-android/issues/4144 is closed
1312+
'torvalds/linux',
1313+
'tpn/winsdk-10',
1314+
};
1315+
1316+
const List<String> linkPrefixes = <String>[
1317+
'https://raw.githubusercontent.com/',
1318+
'https://github.com/',
1319+
];
1320+
1321+
final List<String> problems = <String>[];
1322+
final Set<String> suggestions = <String>{};
1323+
final List<File> files = await _gitFiles(workingDirectory);
1324+
for (final File file in files) {
1325+
for (final String linkPrefix in linkPrefixes) {
1326+
final Uint8List bytes = file.readAsBytesSync();
1327+
// We allow invalid UTF-8 here so that binaries don't trip us up.
1328+
// There's a separate test in this file that verifies that all text
1329+
// files are actually valid UTF-8 (see verifyNoBinaries below).
1330+
final String contents = utf8.decode(bytes, allowMalformed: true);
1331+
int start = 0;
1332+
while ((start = contents.indexOf(linkPrefix, start)) >= 0) {
1333+
int end = start + linkPrefixes.length;
1334+
while (end < contents.length && !stops.contains(contents[end])) {
1335+
end += 1;
1336+
}
1337+
final String url = contents.substring(start, end);
1338+
if (url.startsWith(linkPrefix) && !repoExceptions.any(url.contains)) {
1339+
if (url.contains('master')) {
1340+
problems.add('${file.path} contains $url, which uses the banned "master" branch.');
1341+
suggestions.add('Change the URLs above to the expected pattern by '
1342+
'using the "main" branch if it exists, otherwise adding the '
1343+
'repository to the list of exceptions in analyze.dart.');
1344+
}
1345+
}
1346+
start = end;
1347+
}
1348+
}
1349+
}
1350+
assert(problems.isEmpty == suggestions.isEmpty);
1351+
if (problems.isNotEmpty) {
1352+
foundError(<String>[
1353+
...problems,
1354+
...suggestions,
1355+
]);
1356+
}
1357+
}
1358+
12941359
@immutable
12951360
class Hash256 {
12961361
const Hash256(this.a, this.b, this.c, this.d);

‎dev/bots/codelabs_build_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if [ ${PIPESTATUS[0]} -eq 0 ] || is_expected_failure "$log_file"; then
2929
rm "$log_file"
3030
else
3131
all_builds_ok=0
32-
echo "View https://github.com/flutter/flutter/blob/master/dev/bots/README.md for steps to resolve this failed build test." >> ${log_file}
32+
echo "View https://github.com/flutter/flutter/blob/main/dev/bots/README.md for steps to resolve this failed build test." >> ${log_file}
3333
echo
3434
echo "Log left in $log_file."
3535
echo

‎dev/bots/test/analyze_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ void main() {
310310
expect(result,
311311
'╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════\n'
312312
'$lines\n'
313-
'║ See: https://github.com/flutter/flutter/blob/master/dev/tools/gen_defaults to update the token template files.\n'
313+
'║ See: https://github.com/flutter/flutter/blob/main/dev/tools/gen_defaults to update the token template files.\n'
314314
'╚═══════════════════════════════════════════════════════════════════════════════\n'
315315
);
316316
});

‎dev/conductor/core/bin/cli.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:file/local.dart';
1313
import 'package:platform/platform.dart';
1414
import 'package:process/process.dart';
1515

16-
const String readmeUrl = 'https://github.com/flutter/flutter/tree/master/dev/conductor/README.md';
16+
const String readmeUrl = 'https://github.com/flutter/flutter/tree/main/dev/conductor/README.md';
1717

1818
Future<void> main(List<String> args) async {
1919
const FileSystem fileSystem = LocalFileSystem();

‎dev/customer_testing/run_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Future<bool> run(List<String> arguments) async {
6060
void printHelp() {
6161
print('run_tests.dart [options...] path/to/file1.test path/to/file2.test...');
6262
print('For details on the test registry format, see:');
63-
print(' https://github.com/flutter/tests/blob/master/registry/template.test');
63+
print(' https://github.com/flutter/tests/blob/main/registry/template.test');
6464
print('');
6565
print(argParser.usage);
6666
print('');

‎dev/devicelab/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ _TASK_- the name of your test that also matches the name of the
217217
file in `bin/tasks` without the `.dart` extension.
218218

219219
1. Add target to
220-
[.ci.yaml](https://github.com/flutter/flutter/blob/master/.ci.yaml)
220+
[.ci.yaml](https://github.com/flutter/flutter/blob/main/.ci.yaml)
221221
* Mirror an existing one that has the recipe `devicelab_drone`
222222

223223
If your test needs to run on multiple operating systems, create a separate
@@ -237,7 +237,7 @@ and the test will run based on the artifact against a testbed with a device.
237237

238238
Steps:
239239

240-
1. Update the task class to extend [`BuildTestTask`](https://github.com/flutter/flutter/blob/master/dev/devicelab/lib/tasks/build_test_task.dart)
240+
1. Update the task class to extend [`BuildTestTask`](https://github.com/flutter/flutter/blob/main/dev/devicelab/lib/tasks/build_test_task.dart)
241241
- Override function `getBuildArgs`
242242
- Override function `getTestArgs`
243243
- Override function `parseTaskResult`

‎dev/devicelab/lib/framework/devices.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ class AndroidDevice extends Device {
649649

650650
/// Retrieves device's wakefulness state.
651651
///
652-
/// See: https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/os/PowerManagerInternal.java
652+
/// See: https://android.googlesource.com/platform/frameworks/base/+/main/core/java/android/os/PowerManagerInternal.java
653653
Future<String> _getWakefulness() async {
654654
final String powerInfo = await shellEval('dumpsys', <String>['power']);
655655
// A motoG4 phone returns `mWakefulness=Awake`.

‎dev/integration_tests/deferred_components_test/run_release_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#
1010
# In CI, this script currently depends on a modified version of bundletool because
1111
# ddmlib which bundletool depends on does not yet support detecting QEMU emulator device
12-
# density system properties. See https://android.googlesource.com/platform/tools/base/+/refs/heads/master/ddmlib/src/main/java/com/android/ddmlib/IDevice.java#46
12+
# density system properties. See https://android.googlesource.com/platform/tools/base/+/refs/heads/main/ddmlib/src/main/java/com/android/ddmlib/IDevice.java#46
1313
#
1414
# The modified bundletool which waives the density requirement is at:
1515
# https://chrome-infra-packages.appspot.com/p/flutter/android/bundletool/+/vFt1jA0cUeZLmUCVR5NG2JVB-SgJ18GH_pVYKMOlfUIC

‎dev/integration_tests/web_e2e_tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ More resources:
3737

3838
[1]: https://chromedriver.chromium.org/downloads
3939
[2]: https://flutter.dev/docs/development/tools/web-renderers
40-
[3]: https://github.com/flutter/flutter/blob/master/dev/bots/test.dart
40+
[3]: https://github.com/flutter/flutter/blob/main/dev/bots/test.dart
4141
[4]: https://flutter.dev/docs/testing/build-modes

‎dev/snippets/config/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ The [snippets] tool uses the files in the `skeletons` directory to inject code
44
blocks generated from `{@tool dartpad}`, `{@tool sample}`, and `{@tool snippet}`
55
sections found in doc comments into the API docs.
66

7-
[snippets]: https://github.com/flutter/assets-for-api-docs/tree/master/packages/snippets
7+
[snippets]: https://github.com/flutter/assets-for-api-docs/tree/main/packages/snippets

‎dev/tools/gen_keycodes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The planes are planned as follows:
7777

7878
- **Plane 0x01**: The unprintable plane. This plane contains logical keys that
7979
are defined by the [Chromium key
80-
list](https://chromium.googlesource.com/codesearch/chromium/src/+/refs/heads/master/ui/events/keycodes/dom/dom_key_data.inc)
80+
list](https://chromium.googlesource.com/codesearch/chromium/src/+/refs/heads/main/ui/events/keycodes/dom/dom_key_data.inc)
8181
and do not generate Unicode characters. The value is defined as the macro
8282
value defined by the Chromium key list. Examples are CapsLock (0x105),
8383
ArrowUp (0x304), F1 (0x801), Hiragata (0x716), and TVPower (0xD4B).

‎dev/tools/gen_keycodes/bin/gen_keycodes.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Future<String> getChromiumKeys() async {
3939

4040
/// Get contents of the file that contains the key codes in Android source.
4141
Future<String> getAndroidKeyCodes() async {
42-
final Uri keyCodesUri = Uri.parse('https://android.googlesource.com/platform/frameworks/native/+/master/include/android/keycodes.h?format=TEXT');
42+
final Uri keyCodesUri = Uri.parse('https://android.googlesource.com/platform/frameworks/native/+/main/include/android/keycodes.h?format=TEXT');
4343
return utf8.decode(base64.decode(await http.read(keyCodesUri)));
4444
}
4545

@@ -55,7 +55,7 @@ Future<String> getWindowsKeyCodes() async {
5555
/// common keyboards. Other than some special keyboards and game pads, this
5656
/// should be OK.
5757
Future<String> getAndroidScanCodes() async {
58-
final Uri scanCodesUri = Uri.parse('https://android.googlesource.com/platform/frameworks/base/+/master/data/keyboards/Generic.kl?format=TEXT');
58+
final Uri scanCodesUri = Uri.parse('https://android.googlesource.com/platform/frameworks/base/+/main/data/keyboards/Generic.kl?format=TEXT');
5959
return utf8.decode(base64.decode(await http.read(scanCodesUri)));
6060
}
6161

‎packages/flutter/lib/src/animation/curves.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@ class _DecelerateCurve extends Curve {
12301230
@override
12311231
double transformInternal(double t) {
12321232
// Intended to match the behavior of:
1233-
// https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/view/animation/DecelerateInterpolator.java
1233+
// https://android.googlesource.com/platform/frameworks/base/+/main/core/java/android/view/animation/DecelerateInterpolator.java
12341234
// ...as of December 2016.
12351235
t = 1.0 - t;
12361236
return 1.0 - t * t;

‎packages/flutter/lib/src/gestures/constants.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// found in the LICENSE file.
44

55
// Modeled after Android's ViewConfiguration:
6-
// https://github.com/android/platform_frameworks_base/blob/master/core/java/android/view/ViewConfiguration.java
6+
// https://github.com/android/platform_frameworks_base/blob/main/core/java/android/view/ViewConfiguration.java
77

88
/// The time that must elapse before a tap gesture sends onTapDown, if there's
99
/// any doubt that the gesture is a tap.

‎packages/flutter/lib/src/material/ink_sparkle.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ class InkSparkle extends InteractiveInkFeature {
316316

317317
/// All double values for uniforms come from the Android 12 ripple
318318
/// implementation from the following files:
319-
/// - https://cs.android.com/android/platform/superproject/+/master:frameworks/base/graphics/java/android/graphics/drawable/RippleShader.java
320-
/// - https://cs.android.com/android/platform/superproject/+/master:frameworks/base/graphics/java/android/graphics/drawable/RippleDrawable.java
321-
/// - https://cs.android.com/android/platform/superproject/+/master:frameworks/base/graphics/java/android/graphics/drawable/RippleAnimationSession.java
319+
/// - https://cs.android.com/android/platform/superproject/+/main:frameworks/base/graphics/java/android/graphics/drawable/RippleShader.java
320+
/// - https://cs.android.com/android/platform/superproject/+/main:frameworks/base/graphics/java/android/graphics/drawable/RippleDrawable.java
321+
/// - https://cs.android.com/android/platform/superproject/+/main:frameworks/base/graphics/java/android/graphics/drawable/RippleAnimationSession.java
322322
void _updateFragmentShader() {
323323
const double turbulenceScale = 1.5;
324324
final double turbulencePhase = _turbulenceSeed + _radiusScale.value;

‎packages/flutter/lib/src/rendering/box.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ final class _LayoutCacheStorage {
11851185
/// positioned at 0,0. If this is not true, then use [RenderShiftedBox] instead.
11861186
///
11871187
/// See
1188-
/// [proxy_box.dart](https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/rendering/proxy_box.dart)
1188+
/// [proxy_box.dart](https://github.com/flutter/flutter/blob/main/packages/flutter/lib/src/rendering/proxy_box.dart)
11891189
/// for examples of inheriting from [RenderProxyBox].
11901190
///
11911191
/// #### Using RenderShiftedBox
@@ -1196,7 +1196,7 @@ final class _LayoutCacheStorage {
11961196
/// default layout algorithm.
11971197
///
11981198
/// See
1199-
/// [shifted_box.dart](https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/rendering/shifted_box.dart)
1199+
/// [shifted_box.dart](https://github.com/flutter/flutter/blob/main/packages/flutter/lib/src/rendering/shifted_box.dart)
12001200
/// for examples of inheriting from [RenderShiftedBox].
12011201
///
12021202
/// #### Kinds of children and child-specific data

‎packages/flutter/lib/src/services/raw_keyboard_fuchsia.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class RawKeyEventDataFuchsia extends RawKeyEventData {
5353

5454
/// The modifiers that were present when the key event occurred.
5555
///
56-
/// See <https://fuchsia.googlesource.com/garnet/+/master/public/fidl/fuchsia.ui.input/input_event_constants.fidl>
56+
/// See <https://android.googlesource.com/platform/prebuilts/fuchsia_sdk/+/main/fidl/fuchsia.ui.input/input_event_constants.fidl>
5757
/// for the numerical values of the modifiers. Many of these are also
5858
/// replicated as static constants in this class.
5959
///

‎packages/flutter/lib/src/services/raw_keyboard_windows.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class RawKeyEventDataWindows extends RawKeyEventData {
230230
// These are not the values defined by the Windows header for each modifier. Since they
231231
// can't be packaged into a single int, we are re-defining them here to reduce the size
232232
// of the message from the embedder. Embedders should map these values to the native key codes.
233-
// Keep this in sync with https://github.com/flutter/engine/blob/master/shell/platform/windows/key_event_handler.cc
233+
// Keep this in sync with https://github.com/flutter/engine/blob/main/shell/platform/windows/key_event_handler.cc
234234

235235
/// This mask is used to check the [modifiers] field to test whether one of the
236236
/// SHIFT modifier keys is pressed.

‎packages/flutter/lib/src/widgets/overscroll_indicator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ class _GlowingOverscrollIndicatorState extends State<GlowingOverscrollIndicator>
296296
}
297297

298298
// The Glow logic is a port of the logic in the following file:
299-
// https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/widget/EdgeEffect.java
299+
// https://android.googlesource.com/platform/frameworks/base/+/main/core/java/android/widget/EdgeEffect.java
300300
// as of December 2016.
301301

302302
enum _GlowState { idle, absorb, pull, recede }

‎packages/flutter_driver/lib/fix_data/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ format do not break Flutter.
3838
See [tools/bots/flutter/analyze_flutter_flutter.sh](https://github.com/dart-lang/sdk/blob/main/tools/bots/flutter/analyze_flutter_flutter.sh)
3939
for where the flutter fix tests are invoked for the dart repo.
4040

41-
See [dev/bots/test.dart](https://github.com/flutter/flutter/blob/master/dev/bots/test.dart)
41+
See [dev/bots/test.dart](https://github.com/flutter/flutter/blob/main/dev/bots/test.dart)
4242
for where the flutter fix tests are invoked for the flutter/flutter repo.
4343

4444
When possible, please coordinate changes to this directory that might affect the

‎packages/flutter_driver/lib/src/driver/profiling_summarizer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const Set<String> kProfilingEvents = <String>{
1616
};
1717

1818
// These field names need to be in-sync with:
19-
// https://github.com/flutter/engine/blob/master/shell/profiling/sampling_profiler.cc
19+
// https://github.com/flutter/engine/blob/main/shell/profiling/sampling_profiler.cc
2020
const String _kCpuProfile = 'CpuUsage';
2121
const String _kGpuProfile = 'GpuUsage';
2222
const String _kMemoryProfile = 'MemoryUsage';

0 commit comments

Comments
 (0)