From 32ab3dbee07e462c554e1ca33f264905eb784872 Mon Sep 17 00:00:00 2001 From: Mikkel Nygaard Ravn Date: Wed, 23 Aug 2017 11:58:21 +0200 Subject: [PATCH] Support Xcode projects with no schemes (#11750) --- .../flavors/ios/Runner.xcodeproj/project.pbxproj | 4 ---- packages/flutter_tools/lib/src/ios/mac.dart | 2 +- packages/flutter_tools/lib/src/ios/xcodeproj.dart | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dev/integration_tests/flavors/ios/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/flavors/ios/Runner.xcodeproj/project.pbxproj index a94eae30e2..a7536a457d 100644 --- a/dev/integration_tests/flavors/ios/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/flavors/ios/Runner.xcodeproj/project.pbxproj @@ -317,7 +317,6 @@ buildSettings = { ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = AQ7UHDBEXJ; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -383,7 +382,6 @@ buildSettings = { ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = AQ7UHDBEXJ; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -498,7 +496,6 @@ buildSettings = { ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = AQ7UHDBEXJ; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -521,7 +518,6 @@ buildSettings = { ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = AQ7UHDBEXJ; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index 38853329e6..e6460aeaa9 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -294,7 +294,6 @@ Future buildXcodeProject({ 'clean', 'build', '-configuration', configuration, - '-scheme', scheme, 'ONLY_ACTIVE_ARCH=YES', ]; @@ -306,6 +305,7 @@ Future buildXcodeProject({ if (fs.path.extension(entity.path) == '.xcworkspace') { commands.addAll([ '-workspace', fs.path.basename(entity.path), + '-scheme', scheme, "BUILD_DIR=${fs.path.absolute(getIosBuildDirectory())}", ]); break; diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart index fb65f40125..d2383c4f3f 100644 --- a/packages/flutter_tools/lib/src/ios/xcodeproj.dart +++ b/packages/flutter_tools/lib/src/ios/xcodeproj.dart @@ -119,6 +119,8 @@ class XcodeProjectInfo { } collector?.add(line.trim()); } + if (schemes.isEmpty) + schemes.add('Runner'); return new XcodeProjectInfo(targets, buildConfigurations, schemes); }