Skip to content

Commit

Permalink
Revert "Handle escaped spaces in deps-file. (flutter#23249)" (flutter…
Browse files Browse the repository at this point in the history
…#23270)

This reverts commit 617e8f6 as it
breaks deps-processing on Windows.
  • Loading branch information
aam authored Oct 18, 2018
1 parent 617e8f6 commit 51160b7
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions packages/flutter_tools/gradle/flutter.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -581,13 +581,9 @@ class FlutterTask extends BaseFlutterTask {
if (dependenciesFile.exists()) {
try {
// Dependencies file has Makefile syntax:
// <target> <files>: <source> <files> <separated> <by> <non-escaped space>
// <target> <files>: <source> <files> <separated> <by> <space>
String depText = dependenciesFile.text
// So we split list of files by non-escaped(by backslash) space,
def matcher = depText.split(': ')[1] =~ /(\\ |[^\s])+/
// then we remove all backslashes
def depList = matcher.collect{it[0].replaceAll("\\\\", "")}
return project.files(depList)
return project.files(depText.split(': ')[1].split())
} catch (Exception e) {
logger.error("Error reading dependency file ${dependenciesFile}: ${e}")
}
Expand Down

0 comments on commit 51160b7

Please sign in to comment.