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

[macOS] Flavors project throws no flavor specified for creating a project. (#113979)

Browse Source
This commit is contained in:
Alex Wallen 2022-10-25 09:50:50 -10:00 committed by GitHub
parent b373be8891
commit 92d8b04bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/flutter_tools/lib/src/project.dart
View File

@ -138,10 +138,17 @@ class FlutterProject {
// Don't require iOS build info, this method is only // Don't require iOS build info, this method is only
// used during create as best-effort, use the // used during create as best-effort, use the
// default target bundle identifier. // default target bundle identifier.
try {
final String? bundleIdentifier = await ios.productBundleIdentifier(null); final String? bundleIdentifier = await ios.productBundleIdentifier(null);
if (bundleIdentifier != null) { if (bundleIdentifier != null) {
candidates.add(bundleIdentifier); candidates.add(bundleIdentifier);
} }
} on ToolExit {
// It's possible that while parsing the build info for the ios project
// that the bundleIdentifier can't be resolve. However, we would like
// skip parsing that id in favor of searching in other place. We can
// consider a tool exit in this case to be non fatal for the program.
}
} }
if (android.existsSync()) { if (android.existsSync()) {
final String? applicationId = android.applicationId; final String? applicationId = android.applicationId;

11
packages/flutter_tools/test/general.shard/project_test.dart
View File

@ -509,6 +509,17 @@ apply plugin: 'kotlin-android'
expect(await project.ios.productBundleIdentifier(null), 'io.flutter.someProject.suffix'); expect(await project.ios.productBundleIdentifier(null), 'io.flutter.someProject.suffix');
}); });
testWithMocks('Always pass parsing org on ios project with flavors', () async {
final FlutterProject project = await someProject();
addIosProjectFile(project.directory, projectFileContent: () {
return projectFileWithBundleId('io.flutter.someProject', qualifier: "'");
});
project.ios.xcodeProject.createSync();
xcodeProjectInterpreter.xcodeProjectInfo = XcodeProjectInfo(<String>[], <String>[], <String>['free', 'paid'], logger);
expect(await project.organizationNames, <String>[]);
});
testWithMocks('fails with no flavor and defined schemes', () async { testWithMocks('fails with no flavor and defined schemes', () async {
final FlutterProject project = await someProject(); final FlutterProject project = await someProject();
project.ios.xcodeProject.createSync(); project.ios.xcodeProject.createSync();