When parsing flavors, handle Xcode build configurations that are not lowercase (#161455)
The flavors/Xcode build config/Xcode scheme matching logic tries to be permissive with casing. Instead of passing the lower-cased config into `xcodebuild`, instead pass the real configuration name to get the right casing. Fixes https://github.com/flutter/flutter/issues/85643 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
This commit is contained in:
parent
83bac343ba
commit
f8b9bdceef
@ -506,14 +506,14 @@ class XcodeProjectInfo {
|
|||||||
|
|
||||||
/// Checks whether the [buildConfigurations] contains the specified string, without
|
/// Checks whether the [buildConfigurations] contains the specified string, without
|
||||||
/// regard to case.
|
/// regard to case.
|
||||||
bool hasBuildConfigurationForBuildMode(String buildMode) {
|
String? _existingBuildConfigurationForBuildMode(String buildMode) {
|
||||||
buildMode = buildMode.toLowerCase();
|
buildMode = buildMode.toLowerCase();
|
||||||
for (final String name in buildConfigurations) {
|
for (final String name in buildConfigurations) {
|
||||||
if (name.toLowerCase() == buildMode) {
|
if (name.toLowerCase() == buildMode) {
|
||||||
return true;
|
return name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns unique scheme matching [buildInfo], or null, if there is no unique
|
/// Returns unique scheme matching [buildInfo], or null, if there is no unique
|
||||||
@ -547,8 +547,11 @@ class XcodeProjectInfo {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
final String expectedConfiguration = expectedBuildConfigurationFor(buildInfo, scheme);
|
final String expectedConfiguration = expectedBuildConfigurationFor(buildInfo, scheme);
|
||||||
if (hasBuildConfigurationForBuildMode(expectedConfiguration)) {
|
final String? buildConfigurationForBuildMode = _existingBuildConfigurationForBuildMode(
|
||||||
return expectedConfiguration;
|
expectedConfiguration,
|
||||||
|
);
|
||||||
|
if (buildConfigurationForBuildMode != null) {
|
||||||
|
return buildConfigurationForBuildMode;
|
||||||
}
|
}
|
||||||
final String baseConfiguration = _baseConfigurationFor(buildInfo);
|
final String baseConfiguration = _baseConfigurationFor(buildInfo);
|
||||||
return _uniqueMatch(buildConfigurations, (String candidate) {
|
return _uniqueMatch(buildConfigurations, (String candidate) {
|
||||||
|
@ -919,12 +919,15 @@ Information about project "Runner":
|
|||||||
<String>[
|
<String>[
|
||||||
'debug (free)',
|
'debug (free)',
|
||||||
'Debug paid',
|
'Debug paid',
|
||||||
|
'debug (premium)',
|
||||||
'profile - Free',
|
'profile - Free',
|
||||||
'Profile-Paid',
|
'Profile-Paid',
|
||||||
|
'Profile-Premium',
|
||||||
'release - Free',
|
'release - Free',
|
||||||
'Release-Paid',
|
'Release-Paid',
|
||||||
|
'release-premium',
|
||||||
],
|
],
|
||||||
<String>['Free', 'Paid'],
|
<String>['Free', 'Paid', 'premium'],
|
||||||
logger,
|
logger,
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -952,6 +955,30 @@ Information about project "Runner":
|
|||||||
),
|
),
|
||||||
'Debug paid',
|
'Debug paid',
|
||||||
);
|
);
|
||||||
|
expect(
|
||||||
|
info.buildConfigurationFor(
|
||||||
|
const BuildInfo(
|
||||||
|
BuildMode.debug,
|
||||||
|
'premium',
|
||||||
|
treeShakeIcons: false,
|
||||||
|
packageConfigPath: '.dart_tool/package_config.json',
|
||||||
|
),
|
||||||
|
'premium',
|
||||||
|
),
|
||||||
|
'debug (premium)',
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
info.buildConfigurationFor(
|
||||||
|
const BuildInfo(
|
||||||
|
BuildMode.debug,
|
||||||
|
'premium',
|
||||||
|
treeShakeIcons: false,
|
||||||
|
packageConfigPath: '.dart_tool/package_config.json',
|
||||||
|
),
|
||||||
|
'Premium',
|
||||||
|
),
|
||||||
|
'debug (premium)',
|
||||||
|
);
|
||||||
expect(
|
expect(
|
||||||
info.buildConfigurationFor(
|
info.buildConfigurationFor(
|
||||||
const BuildInfo(
|
const BuildInfo(
|
||||||
@ -964,6 +991,30 @@ Information about project "Runner":
|
|||||||
),
|
),
|
||||||
'profile - Free',
|
'profile - Free',
|
||||||
);
|
);
|
||||||
|
expect(
|
||||||
|
info.buildConfigurationFor(
|
||||||
|
const BuildInfo(
|
||||||
|
BuildMode.profile,
|
||||||
|
'paid',
|
||||||
|
treeShakeIcons: false,
|
||||||
|
packageConfigPath: '.dart_tool/package_config.json',
|
||||||
|
),
|
||||||
|
'paid',
|
||||||
|
),
|
||||||
|
'Profile-Paid',
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
info.buildConfigurationFor(
|
||||||
|
const BuildInfo(
|
||||||
|
BuildMode.profile,
|
||||||
|
'premium',
|
||||||
|
treeShakeIcons: false,
|
||||||
|
packageConfigPath: '.dart_tool/package_config.json',
|
||||||
|
),
|
||||||
|
'Premium',
|
||||||
|
),
|
||||||
|
'Profile-Premium',
|
||||||
|
);
|
||||||
expect(
|
expect(
|
||||||
info.buildConfigurationFor(
|
info.buildConfigurationFor(
|
||||||
const BuildInfo(
|
const BuildInfo(
|
||||||
@ -976,6 +1027,18 @@ Information about project "Runner":
|
|||||||
),
|
),
|
||||||
'Release-Paid',
|
'Release-Paid',
|
||||||
);
|
);
|
||||||
|
expect(
|
||||||
|
info.buildConfigurationFor(
|
||||||
|
const BuildInfo(
|
||||||
|
BuildMode.release,
|
||||||
|
'PREMIUM',
|
||||||
|
treeShakeIcons: false,
|
||||||
|
packageConfigPath: '.dart_tool/package_config.json',
|
||||||
|
),
|
||||||
|
'PREMIUM',
|
||||||
|
),
|
||||||
|
'release-premium',
|
||||||
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user