Create Podfile dynamically part 1 (#11101)
* start
* with create
* refactor cocoapod code, add tests
* fix tests
* throw when cocoapod missing
* obj-c projects don’t use use_framework!
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart
index a4ea001..8fb6ef1 100644
--- a/packages/flutter_tools/lib/src/ios/mac.dart
+++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -21,8 +21,8 @@
import '../globals.dart';
import '../plugins.dart';
import '../services.dart';
+import 'cocoapods.dart';
import 'code_signing.dart';
-import 'ios_workflow.dart';
import 'xcodeproj.dart';
const int kXcodeRequiredVersionMajor = 8;
@@ -215,7 +215,11 @@
final bool hasFlutterPlugins = injectPlugins();
if (hasFlutterPlugins)
- await _runPodInstall(appDirectory, flutterFrameworkDir(mode));
+ await cocoaPods.processPods(
+ appIosDir: appDirectory,
+ iosEngineDir: flutterFrameworkDir(mode),
+ isSwift: app.isSwift,
+ );
updateXcodeGeneratedProperties(
projectPath: fs.currentDirectory.path,
@@ -396,67 +400,6 @@
return true;
}
-final String noCocoaPodsConsequence = '''
- CocoaPods is used to retrieve the iOS platform side's plugin code that responds to your plugin usage on the Dart side.
- Without resolving iOS dependencies with CocoaPods, plugins will not work on iOS.
- For more info, see https://flutter.io/platform-plugins''';
-
-final String cocoaPodsInstallInstructions = '''
- brew update
- brew install cocoapods
- pod setup''';
-
-final String cocoaPodsUpgradeInstructions = '''
- brew update
- brew upgrade cocoapods
- pod setup''';
-
-Future<Null> _runPodInstall(Directory bundle, String engineDirectory) async {
- if (fs.file(fs.path.join(bundle.path, 'Podfile')).existsSync()) {
- if (!await iosWorkflow.isCocoaPodsInstalledAndMeetsVersionCheck) {
- final String minimumVersion = iosWorkflow.cocoaPodsMinimumVersion;
- printError(
- 'Warning: CocoaPods version $minimumVersion or greater not installed. Skipping pod install.\n'
- '$noCocoaPodsConsequence\n'
- 'To install:\n'
- '$cocoaPodsInstallInstructions\n',
- emphasis: true,
- );
- return;
- }
- if (!await iosWorkflow.isCocoaPodsInitialized) {
- printError(
- 'Warning: CocoaPods installed but not initialized. Skipping pod install.\n'
- '$noCocoaPodsConsequence\n'
- 'To initialize CocoaPods, run:\n'
- ' pod setup\n'
- 'once to finalize CocoaPods\' installation.',
- emphasis: true,
- );
- return;
- }
- final Status status = logger.startProgress('Running pod install...', expectSlowOperation: true);
- final ProcessResult result = await processManager.run(
- <String>['pod', 'install', '--verbose'],
- workingDirectory: bundle.path,
- environment: <String, String>{'FLUTTER_FRAMEWORK_DIR': engineDirectory},
- );
- status.stop();
- if (logger.isVerbose || result.exitCode != 0) {
- if (result.stdout.isNotEmpty) {
- printStatus('CocoaPods\' output:\n↳');
- printStatus(result.stdout, indent: 4);
- }
- if (result.stderr.isNotEmpty) {
- printStatus('Error output from CocoaPods:\n↳');
- printStatus(result.stderr, indent: 4);
- }
- }
- if (result.exitCode != 0)
- throwToolExit('Error running pod install');
- }
-}
-
Future<Null> _addServicesToBundle(Directory bundle) async {
final List<Map<String, String>> services = <Map<String, String>>[];
printTrace("Trying to resolve native pub services.");
