Commit f739e9e0 authored by Ian Hickson's avatar Ian Hickson Committed by GitHub

Revert "Don't try to resolve CocoaPods unless project has plugins" (#9719)

* Revert "Document ScrollController (#9705)"

This reverts commit ff8609f2.

* Revert "Fix channels integration test (#9713)"

This reverts commit aace622d.

* Revert "Fix flutter view project's automated tests (#9712)"

This reverts commit 1a4bf9b6.

* Revert "Update hello_world_memory_test package name (#9704)"

This reverts commit ffa8483f.

* Revert "Increment the flutter package version (#9699)"

This reverts commit 3b237a8c.

* Revert "Don’t pod unless there are plugins (#9701)"

This reverts commit 732f79ee.
parent ff8609f2
......@@ -152,9 +152,8 @@ Future<XcodeBuildResult> buildXcodeProject({
// copied over to a location that is suitable for Xcodebuild to find them.
final Directory appDirectory = fs.directory(app.appDirectory);
await _addServicesToBundle(appDirectory);
final bool hasFlutterPlugins = injectPlugins();
injectPlugins();
if (hasFlutterPlugins)
await _runPodInstall(appDirectory, flutterFrameworkDir(mode));
final List<String> commands = <String>[
......
......@@ -194,11 +194,7 @@ void _writeIOSPluginRegistry(String directory, List<Plugin> plugins) {
}
/// Finds Flutter plugins in the pubspec.yaml, creates platform injection
/// registries classes and add them to the build depedencies.
///
/// Returns whether any Flutter plugins are added.
bool injectPlugins({String directory}) {
void injectPlugins({String directory}) {
directory ??= fs.currentDirectory.path;
final List<Plugin> plugins = _findPlugins(directory);
_writeFlutterPluginsList(directory, plugins);
......@@ -206,5 +202,4 @@ bool injectPlugins({String directory}) {
_writeAndroidPluginRegistry(directory, plugins);
if (fs.isDirectorySync(fs.path.join(directory, 'ios')))
_writeIOSPluginRegistry(directory, plugins);
return plugins.isNotEmpty;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment