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
c1d2b854
Unverified
Commit
c1d2b854
authored
Nov 04, 2022
by
Jenn Magder
Committed by
GitHub
Nov 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change some required nullable parameters in tool to non-null (#114115)
parent
48457d73
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
21 deletions
+17
-21
precache.dart
packages/flutter_tools/lib/src/commands/precache.dart
+9
-9
code_signing.dart
packages/flutter_tools/lib/src/ios/code_signing.dart
+1
-5
devfs_web.dart
packages/flutter_tools/lib/src/isolated/devfs_web.dart
+3
-3
flutter_web_goldens.dart
packages/flutter_tools/lib/src/test/flutter_web_goldens.dart
+3
-3
code_signing_test.dart
...utter_tools/test/general.shard/ios/code_signing_test.dart
+1
-1
No files found.
packages/flutter_tools/lib/src/commands/precache.dart
View file @
c1d2b854
...
@@ -14,7 +14,7 @@ import '../runner/flutter_command.dart';
...
@@ -14,7 +14,7 @@ import '../runner/flutter_command.dart';
class
PrecacheCommand
extends
FlutterCommand
{
class
PrecacheCommand
extends
FlutterCommand
{
PrecacheCommand
({
PrecacheCommand
({
bool
verboseHelp
=
false
,
bool
verboseHelp
=
false
,
required
Cache
?
cache
,
required
Cache
cache
,
required
Platform
platform
,
required
Platform
platform
,
required
Logger
logger
,
required
Logger
logger
,
required
FeatureFlags
featureFlags
,
required
FeatureFlags
featureFlags
,
...
@@ -58,7 +58,7 @@ class PrecacheCommand extends FlutterCommand {
...
@@ -58,7 +58,7 @@ class PrecacheCommand extends FlutterCommand {
help:
'Precache the unsigned macOS binaries when available.'
,
hide:
!
verboseHelp
);
help:
'Precache the unsigned macOS binaries when available.'
,
hide:
!
verboseHelp
);
}
}
final
Cache
?
_cache
;
final
Cache
_cache
;
final
Logger
_logger
;
final
Logger
_logger
;
final
Platform
_platform
;
final
Platform
_platform
;
final
FeatureFlags
_featureFlags
;
final
FeatureFlags
_featureFlags
;
...
@@ -133,21 +133,21 @@ class PrecacheCommand extends FlutterCommand {
...
@@ -133,21 +133,21 @@ class PrecacheCommand extends FlutterCommand {
Future
<
FlutterCommandResult
>
runCommand
()
async
{
Future
<
FlutterCommandResult
>
runCommand
()
async
{
// Re-lock the cache.
// Re-lock the cache.
if
(
_platform
.
environment
[
'FLUTTER_ALREADY_LOCKED'
]
!=
'true'
)
{
if
(
_platform
.
environment
[
'FLUTTER_ALREADY_LOCKED'
]
!=
'true'
)
{
await
_cache
!
.
lock
();
await
_cache
.
lock
();
}
}
if
(
boolArgDeprecated
(
'force'
))
{
if
(
boolArgDeprecated
(
'force'
))
{
_cache
!
.
clearStampFiles
();
_cache
.
clearStampFiles
();
}
}
final
bool
includeAllPlatforms
=
boolArgDeprecated
(
'all-platforms'
);
final
bool
includeAllPlatforms
=
boolArgDeprecated
(
'all-platforms'
);
if
(
includeAllPlatforms
)
{
if
(
includeAllPlatforms
)
{
_cache
!
.
includeAllPlatforms
=
true
;
_cache
.
includeAllPlatforms
=
true
;
}
}
if
(
boolArgDeprecated
(
'use-unsigned-mac-binaries'
))
{
if
(
boolArgDeprecated
(
'use-unsigned-mac-binaries'
))
{
_cache
!
.
useUnsignedMacBinaries
=
true
;
_cache
.
useUnsignedMacBinaries
=
true
;
}
}
final
Set
<
String
>
explicitlyEnabled
=
_explicitArtifactSelections
();
final
Set
<
String
>
explicitlyEnabled
=
_explicitArtifactSelections
();
_cache
!
.
platformOverrideArtifacts
=
explicitlyEnabled
;
_cache
.
platformOverrideArtifacts
=
explicitlyEnabled
;
// If the user did not provide any artifact flags, then download
// If the user did not provide any artifact flags, then download
// all artifacts that correspond to an enabled platform.
// all artifacts that correspond to an enabled platform.
...
@@ -164,8 +164,8 @@ class PrecacheCommand extends FlutterCommand {
...
@@ -164,8 +164,8 @@ class PrecacheCommand extends FlutterCommand {
requiredArtifacts
.
add
(
artifact
);
requiredArtifacts
.
add
(
artifact
);
}
}
}
}
if
(!
await
_cache
!
.
isUpToDate
())
{
if
(!
await
_cache
.
isUpToDate
())
{
await
_cache
!
.
updateAll
(
requiredArtifacts
);
await
_cache
.
updateAll
(
requiredArtifacts
);
}
else
{
}
else
{
_logger
.
printStatus
(
'Already up-to-date.'
);
_logger
.
printStatus
(
'Already up-to-date.'
);
}
}
...
...
packages/flutter_tools/lib/src/ios/code_signing.dart
View file @
c1d2b854
...
@@ -97,17 +97,13 @@ final RegExp _certificateOrganizationalUnitExtractionPattern = RegExp(r'OU=([a-z
...
@@ -97,17 +97,13 @@ final RegExp _certificateOrganizationalUnitExtractionPattern = RegExp(r'OU=([a-z
/// Will return null if none are found, if the user cancels or if the Xcode
/// Will return null if none are found, if the user cancels or if the Xcode
/// project has a development team set in the project's build settings.
/// project has a development team set in the project's build settings.
Future
<
Map
<
String
,
String
>?>
getCodeSigningIdentityDevelopmentTeamBuildSetting
({
Future
<
Map
<
String
,
String
>?>
getCodeSigningIdentityDevelopmentTeamBuildSetting
({
required
Map
<
String
,
String
>
?
buildSettings
,
required
Map
<
String
,
String
>
buildSettings
,
required
ProcessManager
processManager
,
required
ProcessManager
processManager
,
required
Platform
platform
,
required
Platform
platform
,
required
Logger
logger
,
required
Logger
logger
,
required
Config
config
,
required
Config
config
,
required
Terminal
terminal
,
required
Terminal
terminal
,
})
async
{
})
async
{
if
(
buildSettings
==
null
)
{
return
null
;
}
// If the user already has it set in the project build settings itself,
// If the user already has it set in the project build settings itself,
// continue with that.
// continue with that.
if
(
_isNotEmpty
(
buildSettings
[
_developmentTeamBuildSettingName
]))
{
if
(
_isNotEmpty
(
buildSettings
[
_developmentTeamBuildSettingName
]))
{
...
...
packages/flutter_tools/lib/src/isolated/devfs_web.dart
View file @
c1d2b854
...
@@ -83,11 +83,11 @@ const String _kDefaultIndex = '''
...
@@ -83,11 +83,11 @@ const String _kDefaultIndex = '''
/// This is only used in development mode.
/// This is only used in development mode.
class
WebExpressionCompiler
implements
ExpressionCompiler
{
class
WebExpressionCompiler
implements
ExpressionCompiler
{
WebExpressionCompiler
(
this
.
_generator
,
{
WebExpressionCompiler
(
this
.
_generator
,
{
required
FileSystem
?
fileSystem
,
required
FileSystem
fileSystem
,
})
:
_fileSystem
=
fileSystem
;
})
:
_fileSystem
=
fileSystem
;
final
ResidentCompiler
_generator
;
final
ResidentCompiler
_generator
;
final
FileSystem
?
_fileSystem
;
final
FileSystem
_fileSystem
;
@override
@override
Future
<
ExpressionCompilationResult
>
compileExpressionToJs
(
Future
<
ExpressionCompilationResult
>
compileExpressionToJs
(
...
@@ -106,7 +106,7 @@ class WebExpressionCompiler implements ExpressionCompiler {
...
@@ -106,7 +106,7 @@ class WebExpressionCompiler implements ExpressionCompiler {
if
(
compilerOutput
!=
null
&&
compilerOutput
.
outputFilename
!=
null
)
{
if
(
compilerOutput
!=
null
&&
compilerOutput
.
outputFilename
!=
null
)
{
final
String
content
=
utf8
.
decode
(
final
String
content
=
utf8
.
decode
(
_fileSystem
!
.
file
(
compilerOutput
.
outputFilename
).
readAsBytesSync
());
_fileSystem
.
file
(
compilerOutput
.
outputFilename
).
readAsBytesSync
());
return
ExpressionCompilationResult
(
return
ExpressionCompilationResult
(
content
,
compilerOutput
.
errorCount
>
0
);
content
,
compilerOutput
.
errorCount
>
0
);
}
}
...
...
packages/flutter_tools/lib/src/test/flutter_web_goldens.dart
View file @
c1d2b854
...
@@ -27,7 +27,7 @@ class TestGoldenComparator {
...
@@ -27,7 +27,7 @@ class TestGoldenComparator {
TestGoldenComparator
(
this
.
shellPath
,
this
.
compilerFactory
,
{
TestGoldenComparator
(
this
.
shellPath
,
this
.
compilerFactory
,
{
required
Logger
logger
,
required
Logger
logger
,
required
FileSystem
fileSystem
,
required
FileSystem
fileSystem
,
required
ProcessManager
?
processManager
,
required
ProcessManager
processManager
,
required
this
.
webRenderer
,
required
this
.
webRenderer
,
})
:
tempDir
=
fileSystem
.
systemTempDirectory
.
createTempSync
(
'flutter_web_platform.'
),
})
:
tempDir
=
fileSystem
.
systemTempDirectory
.
createTempSync
(
'flutter_web_platform.'
),
_logger
=
logger
,
_logger
=
logger
,
...
@@ -39,7 +39,7 @@ class TestGoldenComparator {
...
@@ -39,7 +39,7 @@ class TestGoldenComparator {
final
TestCompiler
Function
()
compilerFactory
;
final
TestCompiler
Function
()
compilerFactory
;
final
Logger
_logger
;
final
Logger
_logger
;
final
FileSystem
_fileSystem
;
final
FileSystem
_fileSystem
;
final
ProcessManager
?
_processManager
;
final
ProcessManager
_processManager
;
final
WebRendererMode
webRenderer
;
final
WebRendererMode
webRenderer
;
TestCompiler
?
_compiler
;
TestCompiler
?
_compiler
;
...
@@ -95,7 +95,7 @@ class TestGoldenComparator {
...
@@ -95,7 +95,7 @@ class TestGoldenComparator {
'FLUTTER_TEST_BROWSER'
:
'chrome'
,
'FLUTTER_TEST_BROWSER'
:
'chrome'
,
'FLUTTER_WEB_RENDERER'
:
webRenderer
==
WebRendererMode
.
html
?
'html'
:
'canvaskit'
,
'FLUTTER_WEB_RENDERER'
:
webRenderer
==
WebRendererMode
.
html
?
'html'
:
'canvaskit'
,
};
};
return
_processManager
!
.
start
(
command
,
environment:
environment
);
return
_processManager
.
start
(
command
,
environment:
environment
);
}
}
Future
<
String
?>
compareGoldens
(
Uri
testUri
,
Uint8List
bytes
,
Uri
goldenKey
,
bool
?
updateGoldens
)
async
{
Future
<
String
?>
compareGoldens
(
Uri
testUri
,
Uint8List
bytes
,
Uri
goldenKey
,
bool
?
updateGoldens
)
async
{
...
...
packages/flutter_tools/test/general.shard/ios/code_signing_test.dart
View file @
c1d2b854
...
@@ -39,7 +39,7 @@ void main() {
...
@@ -39,7 +39,7 @@ void main() {
testWithoutContext
(
'No auto-sign if Xcode project settings are not available'
,
()
async
{
testWithoutContext
(
'No auto-sign if Xcode project settings are not available'
,
()
async
{
final
Map
<
String
,
String
>?
signingConfigs
=
await
getCodeSigningIdentityDevelopmentTeamBuildSetting
(
final
Map
<
String
,
String
>?
signingConfigs
=
await
getCodeSigningIdentityDevelopmentTeamBuildSetting
(
buildSettings:
null
,
buildSettings:
<
String
,
String
>{}
,
processManager:
FakeProcessManager
.
empty
(),
processManager:
FakeProcessManager
.
empty
(),
platform:
macosPlatform
,
platform:
macosPlatform
,
logger:
logger
,
logger:
logger
,
...
...
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