firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up null assumptions for Xcode and CocoaPods classes (#83442)

Browse Source
This commit is contained in:
Jenn Magder 2021-05-26 16:04:03 -07:00 committed by GitHub
parent 883cb3e830
commit cbc7ce0884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/lib/src/build_info.dart
View File

@ -397,7 +397,7 @@ enum EnvironmentType {
simulator, simulator,
} }
String? validatedBuildNumberForPlatform(TargetPlatform targetPlatform, String buildNumber, Logger logger) { String? validatedBuildNumberForPlatform(TargetPlatform targetPlatform, String? buildNumber, Logger logger) {
if (buildNumber == null) { if (buildNumber == null) {
return null; return null;
} }
@ -444,7 +444,7 @@ String? validatedBuildNumberForPlatform(TargetPlatform targetPlatform, String bu
return buildNumber; return buildNumber;
} }
String? validatedBuildNameForPlatform(TargetPlatform targetPlatform, String buildName, Logger logger) { String? validatedBuildNameForPlatform(TargetPlatform targetPlatform, String? buildName, Logger logger) {
if (buildName == null) { if (buildName == null) {
return null; return null;
} }

9
packages/flutter_tools/lib/src/ios/xcode_build_settings.dart
View File

@ -109,7 +109,7 @@ void _updateGeneratedEnvironmentVariablesScript({
/// Build name parsed and validated from build info and manifest. Used for CFBundleShortVersionString. /// Build name parsed and validated from build info and manifest. Used for CFBundleShortVersionString.
String parsedBuildName({ String parsedBuildName({
@required FlutterManifest manifest, @required FlutterManifest manifest,
@required BuildInfo buildInfo, BuildInfo buildInfo,
}) { }) {
final String buildNameToParse = buildInfo?.buildName ?? manifest.buildName; final String buildNameToParse = buildInfo?.buildName ?? manifest.buildName;
return validatedBuildNameForPlatform(TargetPlatform.ios, buildNameToParse, globals.logger); return validatedBuildNameForPlatform(TargetPlatform.ios, buildNameToParse, globals.logger);
@ -118,7 +118,7 @@ String parsedBuildName({
/// Build number parsed and validated from build info and manifest. Used for CFBundleVersion. /// Build number parsed and validated from build info and manifest. Used for CFBundleVersion.
String parsedBuildNumber({ String parsedBuildNumber({
@required FlutterManifest manifest, @required FlutterManifest manifest,
@required BuildInfo buildInfo, BuildInfo buildInfo,
}) { }) {
String buildNumberToParse = buildInfo?.buildNumber ?? manifest.buildNumber; String buildNumberToParse = buildInfo?.buildNumber ?? manifest.buildNumber;
final String buildNumber = validatedBuildNumberForPlatform( final String buildNumber = validatedBuildNumberForPlatform(
@ -173,8 +173,9 @@ List<String> _xcodeBuildSettingsLines({
final String buildNumber = parsedBuildNumber(manifest: project.manifest, buildInfo: buildInfo) ?? '1'; final String buildNumber = parsedBuildNumber(manifest: project.manifest, buildInfo: buildInfo) ?? '1';
xcodeBuildSettings.add('FLUTTER_BUILD_NUMBER=$buildNumber'); xcodeBuildSettings.add('FLUTTER_BUILD_NUMBER=$buildNumber');
if (globals.artifacts is LocalEngineArtifacts) { final Artifacts artifacts = globals.artifacts;
final LocalEngineArtifacts localEngineArtifacts = globals.artifacts as LocalEngineArtifacts; if (artifacts is LocalEngineArtifacts) {
final LocalEngineArtifacts localEngineArtifacts = artifacts;
final String engineOutPath = localEngineArtifacts.engineOutPath; final String engineOutPath = localEngineArtifacts.engineOutPath;
xcodeBuildSettings.add('FLUTTER_ENGINE=${globals.fs.path.dirname(globals.fs.path.dirname(engineOutPath))}'); xcodeBuildSettings.add('FLUTTER_ENGINE=${globals.fs.path.dirname(globals.fs.path.dirname(engineOutPath))}');

2
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View File

@ -389,7 +389,7 @@ class XcodeProjectInfo {
} }
/// Returns unique scheme matching [buildInfo], or null, if there is no unique /// Returns unique scheme matching [buildInfo], or null, if there is no unique
/// best match. /// best match.
String? schemeFor(BuildInfo buildInfo) { String? schemeFor(BuildInfo? buildInfo) {
final String expectedScheme = expectedSchemeFor(buildInfo); final String expectedScheme = expectedSchemeFor(buildInfo);
if (schemes.contains(expectedScheme)) { if (schemes.contains(expectedScheme)) {
return expectedScheme; return expectedScheme;

8
packages/flutter_tools/lib/src/macos/cocoapods.dart
View File

@ -71,8 +71,8 @@ enum CocoaPodsStatus {
brokenInstall, brokenInstall,
} }
String get cocoaPodsMinimumVersion => '1.9.0'; const Version cocoaPodsMinimumVersion = Version.withText(1, 9, 0, '1.9.0');
String get cocoaPodsRecommendedVersion => '1.10.0'; const Version cocoaPodsRecommendedVersion = Version.withText(1, 10, 0, '1.10.0');
/// Cocoapods is a dependency management solution for iOS and macOS applications. /// Cocoapods is a dependency management solution for iOS and macOS applications.
/// ///
@ -142,10 +142,10 @@ class CocoaPods {
if (installedVersion == null) { if (installedVersion == null) {
return CocoaPodsStatus.unknownVersion; return CocoaPodsStatus.unknownVersion;
} }
if (installedVersion < Version.parse(cocoaPodsMinimumVersion)) { if (installedVersion < cocoaPodsMinimumVersion) {
return CocoaPodsStatus.belowMinimumVersion; return CocoaPodsStatus.belowMinimumVersion;
} }
if (installedVersion < Version.parse(cocoaPodsRecommendedVersion)) { if (installedVersion < cocoaPodsRecommendedVersion) {
return CocoaPodsStatus.belowRecommendedVersion; return CocoaPodsStatus.belowRecommendedVersion;
} }
return CocoaPodsStatus.recommended; return CocoaPodsStatus.recommended;

2
packages/flutter_tools/lib/src/macos/cocoapods_validator.dart
View File

@ -52,7 +52,7 @@ class CocoaPodsValidator extends DoctorValidator {
status = ValidationType.partial; status = ValidationType.partial;
final String currentVersionText = await _cocoaPods.cocoaPodsVersionText; final String currentVersionText = await _cocoaPods.cocoaPodsVersionText;
messages.add(ValidationMessage.hint( messages.add(ValidationMessage.hint(
_userMessages.cocoaPodsOutdated(currentVersionText, cocoaPodsRecommendedVersion, noCocoaPodsConsequence, cocoaPodsInstallInstructions))); _userMessages.cocoaPodsOutdated(currentVersionText, cocoaPodsRecommendedVersion.toString(), noCocoaPodsConsequence, cocoaPodsInstallInstructions)));
} }
} }