Add swift_versions to plugin template podspec, include default CocoaPod version (#44324)
diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart
index ec49c82..eb84621 100644
--- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart
+++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart
@@ -13,10 +13,11 @@
/// to confirm the plugin module can be imported into an app.
Future<void> main() async {
await task(() async {
- section('Create Objective-C iOS plugin');
final Directory tempDir = Directory.systemTemp.createTempSync('flutter_plugin_test.');
try {
+ section('Create Objective-C plugin');
+
const String objcPluginName = 'test_plugin_objc';
await inDirectory(tempDir, () async {
await flutter(
@@ -31,8 +32,10 @@
);
});
- final String objcPodspecPath = path.join(tempDir.path, objcPluginName, 'ios', '$objcPluginName.podspec');
- section('Lint Objective-C iOS plugin as framework');
+ section('Lint Objective-C iOS podspec plugin as framework');
+
+ final String objcPluginPath = path.join(tempDir.path, objcPluginName);
+ final String objcPodspecPath = path.join(objcPluginPath, 'ios', '$objcPluginName.podspec');
await inDirectory(tempDir, () async {
await exec(
'pod',
@@ -45,7 +48,8 @@
);
});
- section('Lint Objective-C iOS plugin as library');
+ section('Lint Objective-C iOS podspec plugin as library');
+
await inDirectory(tempDir, () async {
await exec(
'pod',
@@ -59,6 +63,136 @@
);
});
+ section('Create Swift plugin');
+
+ const String swiftPluginName = 'test_plugin_swift';
+ await inDirectory(tempDir, () async {
+ await flutter(
+ 'create',
+ options: <String>[
+ '--org',
+ 'io.flutter.devicelab',
+ '--template=plugin',
+ '--ios-language=swift',
+ swiftPluginName,
+ ],
+ );
+ });
+
+ section('Create Objective-C application');
+
+ const String objcAppName = 'test_app_objc';
+ await inDirectory(tempDir, () async {
+ await flutter(
+ 'create',
+ options: <String>[
+ '--org',
+ 'io.flutter.devicelab',
+ '--ios-language=objc',
+ objcAppName,
+ ],
+ );
+ });
+
+ section('Build Objective-C application with Swift and Objective-C plugins as libraries');
+
+ final String objcAppPath = path.join(tempDir.path, objcAppName);
+
+ final String swiftPluginPath = path.join(tempDir.path, swiftPluginName);
+ final File objcPubspec = File(path.join(objcAppPath, 'pubspec.yaml'));
+ String podspecContent = objcPubspec.readAsStringSync();
+ podspecContent = podspecContent.replaceFirst(
+ '\ndependencies:\n',
+ '\ndependencies:\n $objcPluginName:\n path: $objcPluginPath\n $swiftPluginName:\n path: $swiftPluginPath\n',
+ );
+ objcPubspec.writeAsStringSync(podspecContent, flush: true);
+
+ await inDirectory(objcAppPath, () async {
+ await flutter(
+ 'build',
+ options: <String>[
+ 'ios',
+ '--no-codesign'
+ ],
+ // TODO(jmagman): Make Objective-C applications handle Swift libraries https://github.com/flutter/flutter/issues/16049
+ canFail: true
+ );
+ });
+
+ final File objcPodfile = File(path.join(objcAppPath, 'ios', 'Podfile'));
+ String objcPodfileContent = objcPodfile.readAsStringSync();
+ if (objcPodfileContent.contains('use_frameworks!')) {
+ return TaskResult.failure('Expected default Objective-C Podfile to not contain use_frameworks');
+ }
+
+ section('Build Objective-C application with Swift and Objective-C plugins as frameworks');
+
+ objcPodfileContent = 'use_frameworks!\n' + objcPodfileContent;
+ objcPodfile.writeAsStringSync(objcPodfileContent, flush: true);
+
+ await inDirectory(objcAppPath, () async {
+ await flutter(
+ 'build',
+ options: <String>[
+ 'ios',
+ '--no-codesign'
+ ],
+ );
+ });
+
+ section('Create Swift application');
+
+ const String swiftAppName = 'test_app_swift';
+ await inDirectory(tempDir, () async {
+ await flutter(
+ 'create',
+ options: <String>[
+ '--org',
+ 'io.flutter.devicelab',
+ '--ios-language=swift',
+ swiftAppName,
+ ],
+ );
+ });
+
+ section('Build Swift application with Swift and Objective-C plugins as frameworks');
+
+ final String swiftAppPath = path.join(tempDir.path, swiftAppName);
+
+ final File swiftPubspec = File(path.join(swiftAppPath, 'pubspec.yaml'));
+ swiftPubspec.writeAsStringSync(podspecContent, flush: true);
+
+ await inDirectory(swiftAppPath, () async {
+ await flutter(
+ 'build',
+ options: <String>[
+ 'ios',
+ '--no-codesign'
+ ],
+ );
+ });
+
+ final File swiftPodfile = File(path.join(swiftAppPath, 'ios', 'Podfile'));
+ String swiftPodfileContent = swiftPodfile.readAsStringSync();
+ if (!swiftPodfileContent.contains('use_frameworks!')) {
+ return TaskResult.failure('Expected default Swift Podfile to contain use_frameworks');
+ }
+
+ section('Build Swift application with Swift and Objective-C plugins as libraries');
+
+ swiftPodfileContent = swiftPodfileContent.replaceAll('use_frameworks!', '');
+ swiftPodfile.writeAsStringSync(swiftPodfileContent, flush: true);
+
+ await inDirectory(swiftAppPath, () async {
+ await flutter(
+ 'build',
+ options: <String>[
+ 'ios',
+ '--no-codesign'
+ ],
+ );
+ });
+
return TaskResult.success(null);
} catch (e) {
return TaskResult.failure(e.toString());
diff --git a/packages/flutter_tools/templates/plugin/ios.tmpl/projectName.podspec.tmpl b/packages/flutter_tools/templates/plugin/ios-objc.tmpl/projectName.podspec.tmpl
similarity index 100%
rename from packages/flutter_tools/templates/plugin/ios.tmpl/projectName.podspec.tmpl
rename to packages/flutter_tools/templates/plugin/ios-objc.tmpl/projectName.podspec.tmpl
diff --git a/packages/flutter_tools/templates/plugin/ios-swift.tmpl/Classes/pluginClass.m.tmpl b/packages/flutter_tools/templates/plugin/ios-swift.tmpl/Classes/pluginClass.m.tmpl
index 6d60676..4e16e6c 100644
--- a/packages/flutter_tools/templates/plugin/ios-swift.tmpl/Classes/pluginClass.m.tmpl
+++ b/packages/flutter_tools/templates/plugin/ios-swift.tmpl/Classes/pluginClass.m.tmpl
@@ -1,5 +1,12 @@
#import "{{pluginClass}}.h"
+#if __has_include(<{{projectName}}/{{projectName}}-Swift.h>)
#import <{{projectName}}/{{projectName}}-Swift.h>
+#else
+// Support project import fallback if the generated compatibility header
+// is not copied when this plugin is created as a library.
+// https://forums.swift.org/t/swift-static-libraries-dont-copy-generated-objective-c-header/19816
+#import "{{projectName}}-Swift.h"
+#endif
@implementation {{pluginClass}}
+ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
diff --git a/packages/flutter_tools/templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl b/packages/flutter_tools/templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl
new file mode 100644
index 0000000..1a60d14
--- /dev/null
+++ b/packages/flutter_tools/templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl
@@ -0,0 +1,23 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint {{projectName}}.podspec' to validate before publishing.
+#
+Pod::Spec.new do |s|
+ s.name = '{{projectName}}'
+ s.version = '0.0.1'
+ s.summary = '{{description}}'
+ s.description = <<-DESC
+{{description}}
+ DESC
+ s.homepage = 'http://example.com'
+ s.license = { :file => '../LICENSE' }
+ s.author = { 'Your Company' => 'email@example.com' }
+ s.source = { :path => '.' }
+ s.source_files = 'Classes/**/*'
+ s.dependency 'Flutter'
+ s.platform = :ios, '8.0'
+
+ # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
+ s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
+ s.swift_version = '5.0'
+end
diff --git a/packages/flutter_tools/templates/plugin/macos.tmpl/projectName.podspec.tmpl b/packages/flutter_tools/templates/plugin/macos.tmpl/projectName.podspec.tmpl
index ada388d..5de1fbe 100644
--- a/packages/flutter_tools/templates/plugin/macos.tmpl/projectName.podspec.tmpl
+++ b/packages/flutter_tools/templates/plugin/macos.tmpl/projectName.podspec.tmpl
@@ -18,4 +18,5 @@
s.platform = :osx, '10.11'
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+ s.swift_version = '5.0'
end
