Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
14759dc5
Unverified
Commit
14759dc5
authored
Apr 22, 2021
by
Jonah Williams
Committed by
GitHub
Apr 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[flutter_tools] pin transitive deps during --transitive-closure (#80911)" (#80959)
This reverts commit
c2aa193c
.
parent
43c307b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
38 deletions
+14
-38
allowlist.dart
dev/bots/allowlist.dart
+2
-7
analyze.dart
dev/bots/analyze.dart
+1
-1
update_packages.dart
packages/flutter_tools/lib/src/commands/update_packages.dart
+11
-30
No files found.
dev/bots/allowlist.dart
View file @
14759dc5
...
...
@@ -18,6 +18,7 @@ const Set<String> kCorePackageAllowList = <String>{
'collection'
,
'fake_async'
,
'file'
,
'frontend_server_client'
,
'intl'
,
'meta'
,
'path'
,
...
...
@@ -72,11 +73,5 @@ const Set<String> kCorePackageAllowList = <String>{
'flutter_driver'
,
'flutter_localizations'
,
'flutter_test'
,
'integration_test'
,
'flutter_goldens'
,
'flutter_goldens_client'
,
'fuchsia_remote_debug_protocol'
,
'platform'
,
'process'
,
'sky_engine'
,
'integration_test'
};
dev/bots/analyze.dart
View file @
14759dc5
...
...
@@ -1173,7 +1173,7 @@ Future<void> _checkConsumerDependencies() async {
// Do not change this signature without following the directions in
// dev/bots/allowlist.dart
const String kExpected = '
QnuXnTSwemf+qT+LAU8K8Bb0l9L20z4qT1PUEQlBrVg
=';
const String kExpected = '
nkO7DCjvSMB6VKyw+V9MU46m3xFEk/oYSbmgAWqvbXE
=';
if (disallowed.isNotEmpty) {
exitWithError(<String>[
...
...
packages/flutter_tools/lib/src/commands/update_packages.dart
View file @
14759dc5
...
...
@@ -196,41 +196,22 @@ class UpdatePackagesCommand extends FlutterCommand {
'--force-upgrade cannot be used with the --offline flag'
);
}
if
(
isConsumerOnly
&&
!
isPrintTransitiveClosure
)
{
throwToolExit
(
'--consumer-only can only be used with the --transitive-closure flag'
);
}
// "consumer" packages are those that constitute our public API (e.g. flutter, flutter_test, flutter_driver, flutter_localizations, integration_test).
if
(
isPrintTransitiveClosure
)
{
// Only retain flutter, flutter_test, flutter_driver, and flutter_localizations.
const
List
<
String
>
consumerPackages
=
<
String
>[
'flutter'
,
'flutter_test'
,
'flutter_driver'
,
'flutter_localizations'
,
'integration_test'
];
final
PubDependencyTree
tree
=
PubDependencyTree
();
for
(
final
Directory
package
in
packages
)
{
final
String
packageName
=
globals
.
fs
.
path
.
basename
(
package
.
path
);
if
(!
consumerPackages
.
contains
(
packageName
)
&&
isConsumerOnly
)
{
continue
;
}
await
pub
.
batch
(
<
String
>[
'get'
],
context:
PubContext
.
updatePackages
,
directory:
package
.
path
,
retry:
false
,
// errors here are usually fatal since we're not hitting the network
);
await
pub
.
batch
(
<
String
>[
'deps'
,
'--style=compact'
],
context:
PubContext
.
updatePackages
,
directory:
package
.
path
,
filter:
tree
.
fill
,
retry:
false
,
// errors here are usually fatal since we're not hitting the network
if
(
isConsumerOnly
)
{
if
(!
isPrintTransitiveClosure
)
{
throwToolExit
(
'--consumer-only can only be used with the --transitive-closure flag'
);
}
tree
.
_dependencyTree
.
forEach
((
String
from
,
Set
<
String
>
to
)
{
globals
.
printStatus
(
'
$from
->
$to
'
);
// Only retain flutter, flutter_test, flutter_driver, and flutter_localizations.
const
List
<
String
>
consumerPackages
=
<
String
>[
'flutter'
,
'flutter_test'
,
'flutter_driver'
,
'flutter_localizations'
,
'integration_test'
];
// ensure we only get flutter/packages
packages
.
retainWhere
((
Directory
directory
)
{
return
consumerPackages
.
any
((
String
package
)
{
return
directory
.
path
.
endsWith
(
'packages
${globals.fs.path.separator}$package
'
);
});
});
return
FlutterCommandResult
.
success
();
}
if
(
isVerifyOnly
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment