github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken Flutter module with plugins (#20496)

Browse Source
This commit is contained in:
Mikkel Nygaard Ravn 2018-08-13 10:35:59 +02:00 committed by GitHub
parent ba723b6038
commit e69b434602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev/devicelab/bin/tasks/module_test.dart
View File

@ -31,6 +31,17 @@ Future<Null> main() async {
); );
}); });
section('Add plugins');
final File pubspec = new File(path.join(directory.path, 'hello', 'pubspec.yaml'));
String content = await pubspec.readAsString();
content = content.replaceFirst(
'\ndependencies:\n',
'\ndependencies:\n battery:\n package_info:\n',
);
await pubspec.writeAsString(content, flush: true);
section('Build Flutter module library archive'); section('Build Flutter module library archive');
await inDirectory(new Directory(path.join(directory.path, 'hello', '.android')), () async { await inDirectory(new Directory(path.join(directory.path, 'hello', '.android')), () async {

7
packages/flutter_tools/lib/src/ios/cocoapods.dart
View File

@ -148,7 +148,7 @@ class CocoaPods {
return true; return true;
} }
/// Ensures the `ios` sub-project of the Flutter project at [appDirectory] /// Ensures the given iOS sub-project of a parent Flutter project
/// contains a suitable `Podfile` and that its `Flutter/Xxx.xcconfig` files /// contains a suitable `Podfile` and that its `Flutter/Xxx.xcconfig` files
/// include pods configuration. /// include pods configuration.
void setupPodfile(IosProject iosProject) { void setupPodfile(IosProject iosProject) {
@ -156,13 +156,14 @@ class CocoaPods {
// Don't do anything for iOS when host platform doesn't support it. // Don't do anything for iOS when host platform doesn't support it.
return; return;
} }
if (!iosProject.directory.existsSync()) { final Directory runnerProject = iosProject.directory.childDirectory('Runner.xcodeproj');
if (!runnerProject.existsSync()) {
return; return;
} }
final File podfile = iosProject.podfile; final File podfile = iosProject.podfile;
if (!podfile.existsSync()) { if (!podfile.existsSync()) {
final bool isSwift = xcodeProjectInterpreter.getBuildSettings( final bool isSwift = xcodeProjectInterpreter.getBuildSettings(
iosProject.directory.childFile('Runner.xcodeproj').path, runnerProject.path,
'Runner', 'Runner',
).containsKey('SWIFT_VERSION'); ).containsKey('SWIFT_VERSION');
final File podfileTemplate = fs.file(fs.path.join( final File podfileTemplate = fs.file(fs.path.join(

7
packages/flutter_tools/templates/module/android/Flutter.tmpl/src/main/java/io/flutter/facade/Flutter.java
View File

@ -12,6 +12,7 @@ import io.flutter.plugin.common.BasicMessageChannel;
import io.flutter.plugin.common.StringCodec; import io.flutter.plugin.common.StringCodec;
import io.flutter.view.FlutterMain; import io.flutter.view.FlutterMain;
import io.flutter.view.FlutterNativeView; import io.flutter.view.FlutterNativeView;
import io.flutter.view.FlutterRunArguments;
import io.flutter.view.FlutterView; import io.flutter.view.FlutterView;
import io.flutter.plugins.GeneratedPluginRegistrant; import io.flutter.plugins.GeneratedPluginRegistrant;
@ -91,8 +92,10 @@ public final class Flutter {
lifecycle.addObserver(new LifecycleObserver() { lifecycle.addObserver(new LifecycleObserver() {
@OnLifecycleEvent(Lifecycle.Event.ON_CREATE) @OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
public void onCreate() { public void onCreate() {
final String appBundlePath = FlutterMain.findAppBundlePath(activity.getApplicationContext()); final FlutterRunArguments arguments = new FlutterRunArguments();
flutterView.runFromBundle(appBundlePath, null, "main", true); arguments.bundlePath = FlutterMain.findAppBundlePath(activity.getApplicationContext());
arguments.entrypoint = "main";
flutterView.runFromBundle(arguments);
GeneratedPluginRegistrant.registerWith(flutterView.getPluginRegistry()); GeneratedPluginRegistrant.registerWith(flutterView.getPluginRegistry());
} }

2
packages/flutter_tools/test/ios/cocoapods_test.dart
View File

@ -46,7 +46,7 @@ void main() {
mockProcessManager = new MockProcessManager(); mockProcessManager = new MockProcessManager();
mockXcodeProjectInterpreter = new MockXcodeProjectInterpreter(); mockXcodeProjectInterpreter = new MockXcodeProjectInterpreter();
projectUnderTest = await FlutterProject.fromDirectory(fs.directory('project')); projectUnderTest = await FlutterProject.fromDirectory(fs.directory('project'));
projectUnderTest.ios.directory.createSync(recursive: true); projectUnderTest.ios.directory.childDirectory('Runner.xcodeproj').createSync(recursive: true);
cocoaPodsUnderTest = new CocoaPods(); cocoaPodsUnderTest = new CocoaPods();
pretendPodVersionIs('1.5.0'); pretendPodVersionIs('1.5.0');
fs.file(fs.path.join( fs.file(fs.path.join(