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

Make plugins work in Swift projects (#15437)

Browse source
This commit is contained in:
Mikkel Nygaard Ravn 2018-03-12 17:33:10 +01:00 committed by GitHub
parent c0118ea4b9
commit 658f9e6c83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dev/devicelab/bin/tasks/plugin_test.dart
View file

@ -8,5 +8,8 @@ import 'package:flutter_devicelab/tasks/plugin_tests.dart';
import 'package:flutter_devicelab/framework/framework.dart';
Future<Null> main() async {
await task(new PluginTest('apk'));
await task(combine(<TaskFunction>[
new PluginTest('apk', <String>['-a', 'java']),
new PluginTest('apk', <String>['-a', 'kotlin']),
]));
}

5
dev/devicelab/bin/tasks/plugin_test_ios.dart
View file

@ -8,5 +8,8 @@ import 'package:flutter_devicelab/tasks/plugin_tests.dart';
import 'package:flutter_devicelab/framework/framework.dart';
Future<Null> main() async {
await task(new PluginTest('ios'));
await task(combine(<TaskFunction>[
new PluginTest('ios', <String>['-i', 'objc']),
new PluginTest('ios', <String>['-i', 'swift']),
]));
}

5
dev/devicelab/bin/tasks/plugin_test_win.dart
View file

@ -8,5 +8,8 @@ import 'package:flutter_devicelab/tasks/plugin_tests.dart';
import 'package:flutter_devicelab/framework/framework.dart';
Future<Null> main() async {
await task(new PluginTest('apk'));
await task(combine(<TaskFunction>[
new PluginTest('apk', <String>['-a', 'java']),
new PluginTest('apk', <String>['-a', 'kotlin']),
]));
}

25
dev/devicelab/lib/tasks/plugin_tests.dart
View file

@ -10,17 +10,31 @@ import 'package:flutter_devicelab/framework/framework.dart';
import 'package:flutter_devicelab/framework/ios.dart';
import 'package:flutter_devicelab/framework/utils.dart';
/// Combines several TaskFunctions with trivial success value into one.
TaskFunction combine(List<TaskFunction> tasks) {
return () async {
for (TaskFunction task in tasks) {
final TaskResult result = await task();
if (result.failed) {
return result;
}
}
return new TaskResult.success(null);
};
}
/// Defines task that creates new Flutter project, adds a plugin, and then
/// builds the specified [buildTarget].
class PluginTest {
final String buildTarget;
final List<String> options;
PluginTest(this.buildTarget);
PluginTest(this.buildTarget, this.options);
Future<TaskResult> call() async {
section('Create Flutter project');
final Directory tmp = await Directory.systemTemp.createTemp('plugin');
final FlutterProject project = await FlutterProject.create(tmp);
final FlutterProject project = await FlutterProject.create(tmp, options);
if (buildTarget == 'ios') {
await prepareProvisioningCertificates(project.rootPath);
}
@ -46,9 +60,12 @@ class FlutterProject {
final Directory parent;
final String name;
static Future<FlutterProject> create(Directory directory) async {
static Future<FlutterProject> create(Directory directory, List<String> options) async {
await inDirectory(directory, () async {
await flutter('create', options: <String>['--org', 'io.flutter.devicelab', 'plugintest']);
await flutter(
'create',
options: <String>['--org', 'io.flutter.devicelab']..addAll(options)..add('plugintest')
);
});
return new FlutterProject(directory, 'plugintest');
}

4
packages/flutter_tools/templates/cocoapods/Podfile-swift
View file

@ -67,5 +67,9 @@ post_install do |installer|
target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO'
end
# workaround for https://github.com/CocoaPods/CocoaPods/issues/7463
target.headers_build_phase.files.each do |file|
file.settings = { 'ATTRIBUTES' => ['Public'] }
end
end
end