Case insensitive check flavor names against Xcode schemes (#61140)
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index 4398459..1223b2e 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -119,18 +119,10 @@ await removeFinderExtendedAttributes(app.project.hostAppRoot, processUtils, globals.logger); - final XcodeProjectInfo projectInfo = await globals.xcodeProjectInterpreter.getInfo(app.project.hostAppRoot.path); + final XcodeProjectInfo projectInfo = await app.project.projectInfo(); final String scheme = projectInfo.schemeFor(buildInfo); if (scheme == null) { - globals.printError(''); - if (projectInfo.definesCustomSchemes) { - globals.printError('The Xcode project defines schemes: ${projectInfo.schemes.join(', ')}'); - globals.printError('You must specify a --flavor option to select one of them.'); - } else { - globals.printError('The Xcode project does not define custom schemes.'); - globals.printError('You cannot use the --flavor option.'); - } - return XcodeBuildResult(success: false); + projectInfo.reportFlavorNotFoundAndExit(); } final String configuration = projectInfo.buildConfigurationFor(buildInfo, scheme); if (configuration == null) {
diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart index 873c6af..8b09b35 100644 --- a/packages/flutter_tools/lib/src/ios/xcodeproj.dart +++ b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
@@ -391,7 +391,7 @@ if (result.exitCode == missingProjectExitCode) { throwToolExit('Unable to get Xcode project information:\n ${result.stderr}'); } - return XcodeProjectInfo.fromXcodeBuildOutput(result.toString()); + return XcodeProjectInfo.fromXcodeBuildOutput(result.toString(), _logger); } } @@ -435,9 +435,14 @@ /// /// Represents the output of `xcodebuild -list`. class XcodeProjectInfo { - XcodeProjectInfo(this.targets, this.buildConfigurations, this.schemes); + XcodeProjectInfo( + this.targets, + this.buildConfigurations, + this.schemes, + Logger logger + ) : _logger = logger; - factory XcodeProjectInfo.fromXcodeBuildOutput(String output) { + factory XcodeProjectInfo.fromXcodeBuildOutput(String output, Logger logger) { final List<String> targets = <String>[]; final List<String> buildConfigurations = <String>[]; final List<String> schemes = <String>[]; @@ -461,16 +466,18 @@ if (schemes.isEmpty) { schemes.add('Runner'); } - return XcodeProjectInfo(targets, buildConfigurations, schemes); + return XcodeProjectInfo(targets, buildConfigurations, schemes, logger); } final List<String> targets; final List<String> buildConfigurations; final List<String> schemes; + final Logger _logger; bool get definesCustomSchemes => !(schemes.contains('Runner') && schemes.length == 1); /// The expected scheme for [buildInfo]. + @visibleForTesting static String expectedSchemeFor(BuildInfo buildInfo) { return toTitleCase(buildInfo?.flavor ?? 'runner'); } @@ -507,6 +514,16 @@ }); } + void reportFlavorNotFoundAndExit() { + _logger.printError(''); + if (definesCustomSchemes) { + _logger.printError('The Xcode project defines schemes: ${schemes.join(', ')}'); + throwToolExit('You must specify a --flavor option to select one of the available schemes.'); + } else { + throwToolExit('The Xcode project does not define custom schemes. You cannot use the --flavor option.'); + } + } + /// Returns unique build configuration matching [buildInfo] and [scheme], or /// null, if there is no unique best match. String buildConfigurationFor(BuildInfo buildInfo, String scheme) {
diff --git a/packages/flutter_tools/lib/src/macos/build_macos.dart b/packages/flutter_tools/lib/src/macos/build_macos.dart index 83c9849..b885195 100644 --- a/packages/flutter_tools/lib/src/macos/build_macos.dart +++ b/packages/flutter_tools/lib/src/macos/build_macos.dart
@@ -61,7 +61,7 @@ ); final String scheme = projectInfo.schemeFor(buildInfo); if (scheme == null) { - throwToolExit('Unable to find expected scheme in Xcode project.'); + projectInfo.reportFlavorNotFoundAndExit(); } final String configuration = projectInfo.buildConfigurationFor(buildInfo, scheme); if (configuration == null) {
diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index 5b8f070..690877d 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart
@@ -20,6 +20,7 @@ import 'globals.dart' as globals; import 'ios/plist_parser.dart'; import 'ios/xcodeproj.dart' as xcode; +import 'ios/xcodeproj.dart'; import 'platform_plugins.dart'; import 'plugins.dart'; import 'template.dart'; @@ -105,11 +106,16 @@ // Don't require iOS build info, this method is only // used during create as best-effort, use the // default target bundle identifier. - await ios.productBundleIdentifier(null), - android.applicationId, - android.group, - example.android.applicationId, - await example.ios.productBundleIdentifier(null), + if (ios.existsSync()) + await ios.productBundleIdentifier(null), + if (android.existsSync()) ...<String>[ + android.applicationId, + android.group, + ], + if (example.android.existsSync()) + example.android.applicationId, + if (example.ios.existsSync()) + await example.ios.productBundleIdentifier(null), ]; return Set<String>.of(candidates .map<String>(_organizationNameFromPackageName) @@ -434,8 +440,12 @@ /// The product bundle identifier of the host app, or null if not set or if /// iOS tooling needed to read it is not installed. - Future<String> productBundleIdentifier(BuildInfo buildInfo) async => - _productBundleIdentifier ??= await _parseProductBundleIdentifier(buildInfo); + Future<String> productBundleIdentifier(BuildInfo buildInfo) async { + if (!existsSync()) { + return null; + } + return _productBundleIdentifier ??= await _parseProductBundleIdentifier(buildInfo); + } String _productBundleIdentifier; Future<String> _parseProductBundleIdentifier(BuildInfo buildInfo) async { @@ -481,8 +491,12 @@ } /// The bundle name of the host app, `My App.app`. - Future<String> hostAppBundleName(BuildInfo buildInfo) async => - _hostAppBundleName ??= await _parseHostAppBundleName(buildInfo); + Future<String> hostAppBundleName(BuildInfo buildInfo) async { + if (!existsSync()) { + return null; + } + return _hostAppBundleName ??= await _parseHostAppBundleName(buildInfo); + } String _hostAppBundleName; Future<String> _parseHostAppBundleName(BuildInfo buildInfo) async { @@ -507,12 +521,32 @@ /// /// Returns null, if iOS tooling is unavailable. Future<Map<String, String>> buildSettingsForBuildInfo(BuildInfo buildInfo) async { + if (!existsSync()) { + return null; + } _buildSettingsByScheme ??= <String, Map<String, String>>{}; - final String scheme = xcode.XcodeProjectInfo.expectedSchemeFor(buildInfo); + final XcodeProjectInfo info = await projectInfo(); + if (info == null) { + return null; + } + + final String scheme = info.schemeFor(buildInfo); + if (scheme == null) { + info.reportFlavorNotFoundAndExit(); + } + return _buildSettingsByScheme[scheme] ??= await _xcodeProjectBuildSettings(scheme); } Map<String, Map<String, String>> _buildSettingsByScheme; + Future<XcodeProjectInfo> projectInfo() async { + if (!existsSync() || !globals.xcodeProjectInterpreter.isInstalled) { + return null; + } + return _projectInfo ??= await globals.xcodeProjectInterpreter.getInfo(hostAppRoot.path); + } + XcodeProjectInfo _projectInfo; + Future<Map<String, String>> _xcodeProjectBuildSettings(String scheme) async { if (!globals.xcodeProjectInterpreter.isInstalled) { return null; @@ -624,32 +658,6 @@ } } - Future<void> makeHostAppEditable() async { - assert(isModule); - if (_editableDirectory.existsSync()) { - throwToolExit('iOS host app is already editable. To start fresh, delete the ios/ folder.'); - } - _deleteIfExistsSync(ephemeralDirectory); - await _overwriteFromTemplate( - globals.fs.path.join('module', 'ios', 'library'), - ephemeralDirectory, - ); - await _overwriteFromTemplate( - globals.fs.path.join('module', 'ios', 'host_app_ephemeral'), - _editableDirectory, - ); - await _overwriteFromTemplate( - globals.fs.path.join('module', 'ios', 'host_app_ephemeral_cocoapods'), - _editableDirectory, - ); - await _overwriteFromTemplate( - globals.fs.path.join('module', 'ios', 'host_app_editable_cocoapods'), - _editableDirectory, - ); - await _updateGeneratedXcodeConfigIfNeeded(); - await injectPlugins(parent); - } - @override File get generatedXcodePropertiesFile => _flutterLibRoot .childDirectory('Flutter') @@ -788,20 +796,6 @@ ) || globals.cache.isOlderThanToolsStamp(ephemeralDirectory); } - Future<void> makeHostAppEditable() async { - assert(isModule); - if (_editableHostAppDirectory.existsSync()) { - throwToolExit('Android host app is already editable. To start fresh, delete the android/ folder.'); - } - await _regenerateLibrary(); - await _overwriteFromTemplate(globals.fs.path.join('module', 'android', 'host_app_common'), _editableHostAppDirectory); - await _overwriteFromTemplate(globals.fs.path.join('module', 'android', 'host_app_editable'), _editableHostAppDirectory); - await _overwriteFromTemplate(globals.fs.path.join('module', 'android', 'gradle'), _editableHostAppDirectory); - gradle.gradleUtils.injectGradleWrapperIfNeeded(_editableHostAppDirectory); - gradle.writeLocalProperties(_editableHostAppDirectory.childFile('local.properties')); - await injectPlugins(parent); - } - File get localPropertiesFile => _flutterLibGradleRoot.childFile('local.properties'); Directory get pluginRegistrantHost => _flutterLibGradleRoot.childDirectory(isModule ? 'Flutter' : 'app');