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
3cee8e0e
Unverified
Commit
3cee8e0e
authored
Feb 20, 2020
by
Jonah Williams
Committed by
GitHub
Feb 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] include depfile outputs in gradle outputs (#50877)
parent
2f09d601
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
flutter.gradle
packages/flutter_tools/gradle/flutter.gradle
+12
-3
No files found.
packages/flutter_tools/gradle/flutter.gradle
View file @
3cee8e0e
...
...
@@ -891,13 +891,13 @@ class FlutterTask extends BaseFlutterTask {
}
}
FileCollection
readDependencies
(
File
dependenciesFile
)
{
FileCollection
readDependencies
(
File
dependenciesFile
,
Boolean
inputs
)
{
if
(
dependenciesFile
.
exists
())
{
// Dependencies file has Makefile syntax:
// <target> <files>: <source> <files> <separated> <by> <non-escaped space>
String
depText
=
dependenciesFile
.
text
// So we split list of files by non-escaped(by backslash) space,
def
matcher
=
depText
.
split
(
': '
)[
1
]
=~
/(\\ |[^\s])+/
def
matcher
=
depText
.
split
(
': '
)[
inputs
?
1
:
0
]
=~
/(\\ |[^\s])+/
// then we replace all escaped spaces with regular spaces
def
depList
=
matcher
.
collect
{
it
[
0
].
replaceAll
(
"\\\\ "
,
" "
)}
return
project
.
files
(
depList
)
...
...
@@ -909,11 +909,20 @@ class FlutterTask extends BaseFlutterTask {
FileCollection
getSourceFiles
()
{
FileCollection
sources
=
project
.
files
()
for
(
File
depfile
in
getDependenciesFiles
())
{
sources
+=
readDependencies
(
depfile
)
sources
+=
readDependencies
(
depfile
,
true
)
}
return
sources
+
project
.
files
(
'pubspec.yaml'
)
}
@OutputFiles
FileCollection
getOutputFiles
()
{
FileCollection
sources
=
project
.
files
()
for
(
File
depfile
in
getDependenciesFiles
())
{
sources
+=
readDependencies
(
depfile
,
false
)
}
return
sources
}
@TaskAction
void
build
()
{
buildBundle
()
...
...
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