development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 11:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

if there is no .ios or ios sub-project, don't attempt building for iOS (#31406)

Browse source
This commit is contained in:
Jonah Williams 2019-04-23 09:49:49 -07:00 committed by GitHub
parent 872a0092e9
commit 15f271ef07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/flutter_tools/lib/src/application_package.dart
View file

@ -306,8 +306,13 @@ abstract class IOSApp extends ApplicationPackage {
} }
factory IOSApp.fromIosProject(IosProject project) { factory IOSApp.fromIosProject(IosProject project) {
if (getCurrentHostPlatform() != HostPlatform.darwin_x64) if (getCurrentHostPlatform() != HostPlatform.darwin_x64) {
return null; return null;
}
// TODO(jonahwilliams): do more verification in this check.
if (!project.exists) {
return null;
}
return BuildableIOSApp(project); return BuildableIOSApp(project);
} }

3
packages/flutter_tools/lib/src/project.dart
View file

@ -231,6 +231,9 @@ class IosProject {
/// True, if the parent Flutter project is a module project. /// True, if the parent Flutter project is a module project.
bool get isModule => parent.isModule; bool get isModule => parent.isModule;
/// Whether the flutter application has an iOS project.
bool get exists => hostAppRoot.existsSync();
/// The xcode config file for [mode]. /// The xcode config file for [mode].
File xcodeConfigFor(String mode) => _flutterLibRoot.childDirectory('Flutter').childFile('$mode.xcconfig'); File xcodeConfigFor(String mode) => _flutterLibRoot.childDirectory('Flutter').childFile('$mode.xcconfig');

8
packages/flutter_tools/test/application_package_test.dart
View file

@ -277,6 +277,14 @@ void main() {
expect(iosApp.id, 'fooBundleId'); expect(iosApp.id, 'fooBundleId');
expect(iosApp.bundleName, 'bundle.app'); expect(iosApp.bundleName, 'bundle.app');
}, overrides: overrides); }, overrides: overrides);
testUsingContext('returns null when there is no ios or .ios directory', () async {
fs.file('pubspec.yaml').createSync();
fs.file('.packages').createSync();
final BuildableIOSApp iosApp = IOSApp.fromIosProject((await FlutterProject.fromDirectory(fs.currentDirectory)).ios);
expect(iosApp, null);
}, overrides: overrides);
}); });
} }