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
83e5a8a0
Unverified
Commit
83e5a8a0
authored
Oct 08, 2019
by
Alexandre Ardhuin
Committed by
GitHub
Oct 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some formatting changes (#41640)
parent
85a3da3a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
48 additions
and
61 deletions
+48
-61
theme_data_test.dart
packages/flutter/test/material/theme_data_test.dart
+2
-2
android_device.dart
packages/flutter_tools/lib/src/android/android_device.dart
+15
-17
web_compilation_delegate.dart
..._tools/lib/src/build_runner/web_compilation_delegate.dart
+1
-3
build_system.dart
...ages/flutter_tools/lib/src/build_system/build_system.dart
+1
-1
source.dart
packages/flutter_tools/lib/src/build_system/source.dart
+1
-1
cache.dart
packages/flutter_tools/lib/src/cache.dart
+14
-23
build_linux.dart
packages/flutter_tools/lib/src/linux/build_linux.dart
+1
-1
multiroot_asset_reader_test.dart
...neral.shard/build_runner/multiroot_asset_reader_test.dart
+1
-1
project_test.dart
packages/flutter_tools/test/general.shard/project_test.dart
+12
-12
No files found.
packages/flutter/test/material/theme_data_test.dart
View file @
83e5a8a0
...
...
@@ -176,7 +176,7 @@ void main() {
primaryColor:
Colors
.
black
,
primaryColorDark:
Colors
.
black
,
primaryColorLight:
Colors
.
black
,
valueIndicatorTextStyle:
const
TextStyle
(
color:
Colors
.
black
)
valueIndicatorTextStyle:
const
TextStyle
(
color:
Colors
.
black
)
,
);
final
ChipThemeData
chipTheme
=
ChipThemeData
.
fromDefaults
(
...
...
@@ -260,7 +260,7 @@ void main() {
primaryColor:
Colors
.
white
,
primaryColorDark:
Colors
.
white
,
primaryColorLight:
Colors
.
white
,
valueIndicatorTextStyle:
const
TextStyle
(
color:
Colors
.
white
)
valueIndicatorTextStyle:
const
TextStyle
(
color:
Colors
.
white
)
,
);
final
ChipThemeData
otherChipTheme
=
ChipThemeData
.
fromDefaults
(
...
...
packages/flutter_tools/lib/src/android/android_device.dart
View file @
83e5a8a0
...
...
@@ -574,24 +574,22 @@ class AndroidDevice extends Device {
...<
String
>[
'--ez'
,
'trace-systrace'
,
'true'
],
if
(
debuggingOptions
.
dumpSkpOnShaderCompilation
)
...<
String
>[
'--ez'
,
'dump-skp-on-shader-compilation'
,
'true'
],
if
(
debuggingOptions
.
debuggingEnabled
)
...<
String
>[
if
(
debuggingOptions
.
buildInfo
.
isDebug
)
...<
String
>[
...<
String
>[
'--ez'
,
'enable-checked-mode'
,
'true'
],
...<
String
>[
'--ez'
,
'verify-entry-points'
,
'true'
],
],
if
(
debuggingOptions
.
startPaused
)
...<
String
>[
'--ez'
,
'start-paused'
,
'true'
],
if
(
debuggingOptions
.
disableServiceAuthCodes
)
...<
String
>[
'--ez'
,
'disable-service-auth-codes'
,
'true'
],
if
(
debuggingOptions
.
dartFlags
.
isNotEmpty
)
...<
String
>[
'--es'
,
'dart-flags'
,
debuggingOptions
.
dartFlags
],
if
(
debuggingOptions
.
useTestFonts
)
...<
String
>[
'--ez'
,
'use-test-fonts'
,
'true'
],
if
(
debuggingOptions
.
verboseSystemLogs
)
...<
String
>[
'--ez'
,
'verbose-logging'
,
'true'
],
if
(
debuggingOptions
.
debuggingEnabled
)
...<
String
>[
if
(
debuggingOptions
.
buildInfo
.
isDebug
)
...<
String
>[
...<
String
>[
'--ez'
,
'enable-checked-mode'
,
'true'
],
...<
String
>[
'--ez'
,
'verify-entry-points'
,
'true'
],
],
if
(
debuggingOptions
.
startPaused
)
...<
String
>[
'--ez'
,
'start-paused'
,
'true'
],
if
(
debuggingOptions
.
disableServiceAuthCodes
)
...<
String
>[
'--ez'
,
'disable-service-auth-codes'
,
'true'
],
if
(
debuggingOptions
.
dartFlags
.
isNotEmpty
)
...<
String
>[
'--es'
,
'dart-flags'
,
debuggingOptions
.
dartFlags
],
if
(
debuggingOptions
.
useTestFonts
)
...<
String
>[
'--ez'
,
'use-test-fonts'
,
'true'
],
if
(
debuggingOptions
.
verboseSystemLogs
)
...<
String
>[
'--ez'
,
'verbose-logging'
,
'true'
],
],
apk
.
launchActivity
,
];
final
String
result
=
(
await
runAdbCheckedAsync
(
cmd
)).
stdout
;
...
...
packages/flutter_tools/lib/src/build_runner/web_compilation_delegate.dart
View file @
83e5a8a0
...
...
@@ -125,9 +125,7 @@ class MultirootFileBasedAssetReader extends core.FileBasedAssetReader {
@override
Stream
<
AssetId
>
findAssets
(
Glob
glob
,
{
String
package
})
async
*
{
if
(
package
==
null
||
packageGraph
.
root
.
name
==
package
)
{
final
String
generatedRoot
=
fs
.
path
.
join
(
generatedDirectory
.
path
,
packageGraph
.
root
.
name
);
final
String
generatedRoot
=
fs
.
path
.
join
(
generatedDirectory
.
path
,
packageGraph
.
root
.
name
);
await
for
(
io
.
FileSystemEntity
entity
in
glob
.
list
(
followLinks:
true
,
root:
packageGraph
.
root
.
path
))
{
if
(
entity
is
io
.
File
&&
_isNotHidden
(
entity
)
&&
!
fs
.
path
.
isWithin
(
generatedRoot
,
entity
.
path
))
{
yield
_fileToAssetId
(
entity
,
packageGraph
.
root
);
...
...
packages/flutter_tools/lib/src/build_system/build_system.dart
View file @
83e5a8a0
...
...
@@ -204,7 +204,7 @@ abstract class Target {
return
<
String
,
Object
>{
'name'
:
name
,
'dependencies'
:
<
String
>[
for
(
Target
target
in
dependencies
)
target
.
name
for
(
Target
target
in
dependencies
)
target
.
name
,
],
'inputs'
:
<
String
>[
for
(
File
file
in
resolveInputs
(
environment
).
sources
)
file
.
path
,
...
...
packages/flutter_tools/lib/src/build_system/source.dart
View file @
83e5a8a0
...
...
@@ -313,4 +313,4 @@ class _DepfileSource implements Source {
@override
bool
get
implicit
=>
false
;
}
\ No newline at end of file
}
packages/flutter_tools/lib/src/cache.dart
View file @
83e5a8a0
...
...
@@ -732,12 +732,11 @@ class FlutterSdk extends EngineCachedArtifact {
return
<
List
<
String
>>[
<
String
>[
'common'
,
'flutter_patched_sdk.zip'
],
<
String
>[
'common'
,
'flutter_patched_sdk_product.zip'
],
if
(
cache
.
includeAllPlatforms
)
...<
List
<
String
>>[
<
String
>[
'windows-x64'
,
'windows-x64/artifacts.zip'
],
<
String
>[
'linux-x64'
,
'linux-x64/artifacts.zip'
],
<
String
>[
'darwin-x64'
,
'darwin-x64/artifacts.zip'
],
]
if
(
cache
.
includeAllPlatforms
)
...<
List
<
String
>>[
<
String
>[
'windows-x64'
,
'windows-x64/artifacts.zip'
],
<
String
>[
'linux-x64'
,
'linux-x64/artifacts.zip'
],
<
String
>[
'darwin-x64'
,
'darwin-x64/artifacts.zip'
],
]
else
if
(
platform
.
isWindows
)
<
String
>[
'windows-x64'
,
'windows-x64/artifacts.zip'
]
else
if
(
platform
.
isMacOS
)
...
...
@@ -831,25 +830,17 @@ class AndroidGenSnapshotArtifacts extends EngineCachedArtifact {
@override
List
<
List
<
String
>>
getBinaryDirs
()
{
return
<
List
<
String
>>[
if
(
cache
.
includeAllPlatforms
)
...<
List
<
String
>>[
...
_osxBinaryDirs
,
...
_linuxBinaryDirs
,
...
_windowsBinaryDirs
,
...
_dartSdks
,
]
else
if
(
platform
.
isWindows
)
...<
List
<
String
>>[
...
_windowsBinaryDirs
,
]
if
(
cache
.
includeAllPlatforms
)
...<
List
<
String
>>[
...
_osxBinaryDirs
,
...
_linuxBinaryDirs
,
...
_windowsBinaryDirs
,
...
_dartSdks
,
]
else
if
(
platform
.
isWindows
)
...
_windowsBinaryDirs
else
if
(
platform
.
isMacOS
)
...<
List
<
String
>>[
...
_osxBinaryDirs
,
]
...
_osxBinaryDirs
else
if
(
platform
.
isLinux
)
...<
List
<
String
>>[
...
_linuxBinaryDirs
,
],
...
_linuxBinaryDirs
,
];
}
...
...
packages/flutter_tools/lib/src/linux/build_linux.dart
View file @
83e5a8a0
...
...
@@ -52,7 +52,7 @@ export PROJECT_DIR=${linuxProject.project.directory.path}
'make'
,
'-C'
,
linuxProject
.
makeFile
.
parent
.
path
,
'BUILD=
$buildFlag
'
'BUILD=
$buildFlag
'
,
]);
final
Status
status
=
logger
.
startProgress
(
'Building Linux application...'
,
...
...
packages/flutter_tools/test/general.shard/build_runner/multiroot_asset_reader_test.dart
View file @
83e5a8a0
...
...
@@ -40,7 +40,7 @@ void main() {
await
IOOverrides
.
runWithIOOverrides
(()
async
{
final
MultirootFileBasedAssetReader
reader
=
MultirootFileBasedAssetReader
(
packageGraph
,
fs
.
directory
(
fs
.
path
.
join
(
'.dart_tool'
,
'build'
,
'generated'
))
fs
.
directory
(
fs
.
path
.
join
(
'.dart_tool'
,
'build'
,
'generated'
))
,
);
expect
(
await
reader
.
canRead
(
AssetId
(
'foobar'
,
'lib/bar.dart'
)),
true
);
expect
(
await
reader
.
canRead
(
AssetId
(
'foobar'
,
'lib/main.dart'
)),
true
);
...
...
packages/flutter_tools/test/general.shard/project_test.dart
View file @
83e5a8a0
...
...
@@ -195,9 +195,9 @@ void main() {
await
project
.
ensureReadyForPlatformSpecificTooling
();
expectExists
(
project
.
macos
.
managedDirectory
.
childFile
(
'GeneratedPluginRegistrant.swift'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
MemoryFileSystem
(),
FeatureFlags:
()
=>
TestFeatureFlags
(
isMacOSEnabled:
true
),
FlutterProjectFactory:
()
=>
FlutterProjectFactory
(),
FileSystem:
()
=>
MemoryFileSystem
(),
FeatureFlags:
()
=>
TestFeatureFlags
(
isMacOSEnabled:
true
),
FlutterProjectFactory:
()
=>
FlutterProjectFactory
(),
});
testUsingContext
(
'generates Xcode configuration for macOS'
,
()
async
{
final
FlutterProject
project
=
await
someProject
();
...
...
@@ -205,9 +205,9 @@ void main() {
await
project
.
ensureReadyForPlatformSpecificTooling
();
expectExists
(
project
.
macos
.
generatedXcodePropertiesFile
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
MemoryFileSystem
(),
FeatureFlags:
()
=>
TestFeatureFlags
(
isMacOSEnabled:
true
),
FlutterProjectFactory:
()
=>
FlutterProjectFactory
(),
FileSystem:
()
=>
MemoryFileSystem
(),
FeatureFlags:
()
=>
TestFeatureFlags
(
isMacOSEnabled:
true
),
FlutterProjectFactory:
()
=>
FlutterProjectFactory
(),
});
testUsingContext
(
'injects plugins for Linux'
,
()
async
{
final
FlutterProject
project
=
await
someProject
();
...
...
@@ -216,9 +216,9 @@ void main() {
expectExists
(
project
.
linux
.
managedDirectory
.
childFile
(
'generated_plugin_registrant.h'
));
expectExists
(
project
.
linux
.
managedDirectory
.
childFile
(
'generated_plugin_registrant.cc'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
MemoryFileSystem
(),
FeatureFlags:
()
=>
TestFeatureFlags
(
isLinuxEnabled:
true
),
FlutterProjectFactory:
()
=>
FlutterProjectFactory
(),
FileSystem:
()
=>
MemoryFileSystem
(),
FeatureFlags:
()
=>
TestFeatureFlags
(
isLinuxEnabled:
true
),
FlutterProjectFactory:
()
=>
FlutterProjectFactory
(),
});
testUsingContext
(
'injects plugins for Windows'
,
()
async
{
final
FlutterProject
project
=
await
someProject
();
...
...
@@ -227,9 +227,9 @@ void main() {
expectExists
(
project
.
windows
.
managedDirectory
.
childFile
(
'generated_plugin_registrant.h'
));
expectExists
(
project
.
windows
.
managedDirectory
.
childFile
(
'generated_plugin_registrant.cc'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
MemoryFileSystem
(),
FeatureFlags:
()
=>
TestFeatureFlags
(
isWindowsEnabled:
true
),
FlutterProjectFactory:
()
=>
FlutterProjectFactory
(),
FileSystem:
()
=>
MemoryFileSystem
(),
FeatureFlags:
()
=>
TestFeatureFlags
(
isWindowsEnabled:
true
),
FlutterProjectFactory:
()
=>
FlutterProjectFactory
(),
});
testInMemory
(
'creates Android library in module'
,
()
async
{
final
FlutterProject
project
=
await
aModuleProject
();
...
...
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