github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix various gradle paths for Windows (#8935)

Browse Source
This commit is contained in:
Michael Goderbauer 2017-03-22 12:31:53 -07:00 committed by GitHub
parent dfb6198feb
commit e01e4c18e1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/lib/src/android/android_studio.dart
View File

@ -38,7 +38,9 @@ String get gradleExecutable {
if (gradleDir != null) { if (gradleDir != null) {
if (fs.isFileSync(gradleDir)) if (fs.isFileSync(gradleDir))
return gradleDir; return gradleDir;
return fs.path.join(gradleDir, 'bin', 'gradle'); return fs.path.join(
gradleDir, 'bin', platform.isWindows ? 'gradle.bat' : 'gradle'
);
} }
return androidStudio?.gradleExecutable ?? os.which('gradle')?.path; return androidStudio?.gradleExecutable ?? os.which('gradle')?.path;
} }

4
packages/flutter_tools/lib/src/android/gradle.dart
View File

@ -105,7 +105,9 @@ String locateSystemGradle({ bool ensureExecutable: true }) {
} }
String locateProjectGradlew({ bool ensureExecutable: true }) { String locateProjectGradlew({ bool ensureExecutable: true }) {
final String path = 'android/gradlew'; final String path = fs.path.join(
'android', platform.isWindows ? 'gradlew.bat' : 'gradlew'
);
if (fs.isFileSync(path)) { if (fs.isFileSync(path)) {
final File gradle = fs.file(path); final File gradle = fs.file(path);