firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Swift plugin Objective-C files (#113585)

Browse Source
This commit is contained in:
Jenn Magder 2022-10-18 11:41:08 -07:00 committed by GitHub
parent eea60f86f1
commit b084249184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/templates/plugin/ios-swift.tmpl/Classes/pluginClass.h.tmpl
View File

@ -1,4 +0,0 @@
#import <Flutter/Flutter.h>
@interface {{pluginClass}} : NSObject<FlutterPlugin>
@end

15
packages/flutter_tools/templates/plugin/ios-swift.tmpl/Classes/pluginClass.m.tmpl
View File

@ -1,15 +0,0 @@
#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 {
[Swift{{pluginClass}} registerWithRegistrar:registrar];
}
@end

4
packages/flutter_tools/templates/plugin/ios-swift.tmpl/Classes/SwiftpluginClass.swift.tmpl → packages/flutter_tools/templates/plugin/ios-swift.tmpl/Classes/pluginClass.swift.tmpl
View File

@ -1,10 +1,10 @@
import Flutter
import UIKit
public class Swift{{pluginClass}}: NSObject, FlutterPlugin {
public class {{pluginClass}}: NSObject, FlutterPlugin {
public static func register(with registrar: FlutterPluginRegistrar) {
let channel = FlutterMethodChannel(name: "{{projectName}}", binaryMessenger: registrar.messenger())
let instance = Swift{{pluginClass}}()
let instance = {{pluginClass}}()
registrar.addMethodCallDelegate(instance, channel: channel)
}

4
packages/flutter_tools/templates/template_manifest.json
View File

@ -258,9 +258,7 @@
"templates/plugin/ios-objc.tmpl/Classes/pluginClass.h.tmpl",
"templates/plugin/ios-objc.tmpl/Classes/pluginClass.m.tmpl",
"templates/plugin/ios-objc.tmpl/projectName.podspec.tmpl",
"templates/plugin/ios-swift.tmpl/Classes/pluginClass.h.tmpl",
"templates/plugin/ios-swift.tmpl/Classes/pluginClass.m.tmpl",
"templates/plugin/ios-swift.tmpl/Classes/SwiftpluginClass.swift.tmpl",
"templates/plugin/ios-swift.tmpl/Classes/pluginClass.swift.tmpl",
"templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl",
"templates/plugin/ios.tmpl/.gitignore",
"templates/plugin/ios.tmpl/Assets/.gitkeep",

6
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View File

@ -638,9 +638,7 @@ void main() {
'example/ios/Runner/AppDelegate.swift',
'example/ios/Runner/Runner-Bridging-Header.h',
'example/lib/main.dart',
'ios/Classes/FlutterProjectPlugin.h',
'ios/Classes/FlutterProjectPlugin.m',
'ios/Classes/SwiftFlutterProjectPlugin.swift',
'ios/Classes/FlutterProjectPlugin.swift',
'lib/flutter_project.dart',
],
unexpectedPaths: <String>[
@ -649,6 +647,8 @@ void main() {
'example/ios/Runner/AppDelegate.h',
'example/ios/Runner/AppDelegate.m',
'example/ios/Runner/main.m',
'ios/Classes/FlutterProjectPlugin.h',
'ios/Classes/FlutterProjectPlugin.m',
],
);
});