DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor logic to get plugins path for android studio in mac (#26964)

Browse Source
This commit is contained in:
KyleWong 2019-02-06 08:48:14 +08:00 committed by xster
parent 704814c67a
commit 7765dd4c3c
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,12 +26,14 @@ AndroidStudio get androidStudio => context[AndroidStudio];
final RegExp _dotHomeStudioVersionMatcher =
RegExp(r'^\.(AndroidStudio[^\d]*)([\d.]+)');
final RegExp _pathsSelectorMatcher =
RegExp(r'"idea.paths.selector" = "AndroidStudio[^;]+"');
String get javaPath => androidStudio?.javaPath;
class AndroidStudio implements Comparable<AndroidStudio> {
AndroidStudio(this.directory,
{Version version, this.configured, this.studioAppName = 'AndroidStudio'})
{Version version, this.configured, this.studioAppName = 'AndroidStudio', this.pathsSelectorPath})
: version = version ?? Version.unknown {
_init();
}
@ -47,7 +49,13 @@ class AndroidStudio implements Comparable<AndroidStudio> {
Version version;
if (versionString != null)
version = Version.parse(versionString);
return AndroidStudio(studioPath, version: version);
final String plistValue = iosWorkflow.getPlistValueFromFile(
plistFile,
null,
);
final String pathsSelectorValue = _pathsSelectorMatcher.stringMatch(plistValue).split('=').last.trim().replaceAll('"', '');
return AndroidStudio(studioPath, version: version, pathsSelectorPath: pathsSelectorValue);
}
factory AndroidStudio.fromHomeDot(Directory homeDotDir) {
@ -83,6 +91,7 @@ class AndroidStudio implements Comparable<AndroidStudio> {
final String studioAppName;
final Version version;
final String configured;
final String pathsSelectorPath;
String _pluginsPath;
String _javaPath;
@ -102,7 +111,7 @@ class AndroidStudio implements Comparable<AndroidStudio> {
homeDirPath,
'Library',
'Application Support',
'AndroidStudio$major.$minor');
'$pathsSelectorPath');
} else {
_pluginsPath = fs.path.join(homeDirPath,
'.$studioAppName$major.$minor',

10
packages/flutter_tools/lib/src/ios/plist_utils.dart
View File

@ -26,9 +26,13 @@ String getValueFromFile(String plistFilePath, String key) {
final String normalizedPlistPath = fs.path.withoutExtension(fs.path.absolute(plistFilePath));
try {
final String value = runCheckedSync(<String>[
executable, 'read', normalizedPlistPath, key
]);
final List<String> args = <String>[
executable, 'read', normalizedPlistPath
];
if (key != null && key.isNotEmpty){
args.add(key);
}
final String value = runCheckedSync(args);
return value.isEmpty ? null : value;
} catch (error) {
return null;