Convert plugins to Swift-based

Updates the example, testbed, and plugins on macOS to account for
flutter/flutter#33997

example_plugin is now entirely Swift, with the ObjC wrapper removed; the
other plugins remain ObjC for now, with a Swift wrapper. The podspecs
have been adjusted to remove the public ObjC headers.

The example has been switched from an empty ObjC registrant to an empty
Swift registrant, and testbed has been updated with the results of
re-running `flutter run` with the new tooling support, and switched to
calling the Swift registrant as well.

Author: stuartmorgan-g

example/macos/ExampleWindow.swift

@@ -18,7 +18,7 @@ class ExampleWindow: NSWindow {
   @IBOutlet weak var flutterViewController: FLEViewController!
 
   override func awakeFromNib() {
-    GeneratedPluginRegistrant.register(with: flutterViewController)
+    RegisterGeneratedPlugins(registry: flutterViewController)
 
     let assets = NSURL.fileURL(withPath: "flutter_assets", relativeTo: Bundle.main.resourceURL)
     var arguments: [String] = [];

example/macos/Flutter/GeneratedPluginRegistrant.h

@@ -0,0 +1,9 @@
+//
+//  Generated file. Do not edit.
+//
+import Foundation
+import FlutterMacOS
+
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+}

example/macos/Flutter/GeneratedPluginRegistrant.m

@@ -13,5 +13,3 @@
 // limitations under the License.
 
 #import <FlutterMacOS/FlutterMacOS.h>
-
-#import "GeneratedPluginRegistrant.h"

example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -21,14 +21,14 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* ExampleWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* ExampleWindow.swift */; };
 		33CC112F204626C80003C045 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC112C20461AD40003C045 /* flutter_assets */; };
 		33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; };
 		33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		33D47B2422A09D2000D05F4F /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 33D47B2322A09D2000D05F4F /* GeneratedPluginRegistrant.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -56,6 +56,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
 		33CC10ED2044A3C60003C045 /* Flutter Desktop Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Flutter Desktop Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -68,8 +69,6 @@
 		33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = "<group>"; };
 		33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = "<group>"; };
 		33D1A10322148B71006C7A3E /* FlutterMacOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FlutterMacOS.framework; path = Flutter/ephemeral/FlutterMacOS.framework; sourceTree = SOURCE_ROOT; };
-		33D47B2222A09D2000D05F4F /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
-		33D47B2322A09D2000D05F4F /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Configs/Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Configs/Debug.xcconfig; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -130,8 +129,7 @@
 		33CEB47122A05771004F2AC0 /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				33D47B2222A09D2000D05F4F /* GeneratedPluginRegistrant.h */,
-				33D47B2322A09D2000D05F4F /* GeneratedPluginRegistrant.m */,
+				335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */,
 				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
 				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
 				33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */,
@@ -256,7 +254,7 @@
 			files = (
 				33CC11132044BFA00003C045 /* ExampleWindow.swift in Sources */,
 				33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */,
-				33D47B2422A09D2000D05F4F /* GeneratedPluginRegistrant.m in Sources */,
+				335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -403,7 +401,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
-					"$PROJECT_DIR/Flutter/ephemeral",
+					$PROJECT_DIR/Flutter/ephemeral,
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Info.plist;
@@ -426,7 +424,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
-					"$PROJECT_DIR/Flutter/ephemeral",
+					$PROJECT_DIR/Flutter/ephemeral,
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Info.plist;

example/macos/Runner-Bridging-Header.h

@@ -12,14 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "ExamplePlugin.h"
+import FlutterMacOS
+import Foundation
 
-#import <example_plugin/example_plugin-Swift.h>
-
-@implementation FDEExamplePlugin
-
-+ (void)registerWithRegistrar:(id<FlutterPluginRegistrar>)registrar {
-  [SwiftExamplePlugin registerWithRegistrar:registrar];
+public class ColorPanelPlugin: NSObject, FlutterPlugin {
+  public static func register(with registrar: FlutterPluginRegistrar) {
+    FLEColorPanelPlugin.register(with: registrar)
+  }
 }
-
-@end

example/macos/Runner.xcodeproj/project.pbxproj

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "ColorPanelPlugin.h"
+#import "FLEColorPanelPlugin.h"
 
 #import <AppKit/AppKit.h>
 

plugins/example_plugin/macos/Classes/ExamplePlugin.m renamed to plugins/color_panel/macos/Classes/ColorPanelPlugin.swift

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'color_panel'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'Provides access to the macOS color picker.'
   s.description      = <<-DESC
 Provides access to the macOS color picker.
@@ -13,10 +13,9 @@ Provides access to the macOS color picker.
   s.author           = { 'Flutter Desktop Embedding Developers' => 'flutter-desktop-embedding-dev@googlegroups.com' }
   s.source           = { :path => '.' }
   s.source_files     = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
   s.dependency 'FlutterMacOS'
 
   s.platform = :osx
-  s.osx.deployment_target = '10.9'
+  s.osx.deployment_target = '10.12'
 end
 

plugins/color_panel/macos/Classes/ColorPanelPlugin.h renamed to plugins/color_panel/macos/Classes/FLEColorPanelPlugin.h

@@ -15,10 +15,10 @@
 import FlutterMacOS
 import Cocoa
 
-public class SwiftExamplePlugin: NSObject, FlutterPlugin {
+public class ExamplePlugin: NSObject, FlutterPlugin {
   public static func register(with registrar: FlutterPluginRegistrar) {
     let channel = FlutterMethodChannel(name: "example_plugin", binaryMessenger: registrar.messenger)
-    let instance = SwiftExamplePlugin()
+    let instance = ExamplePlugin()
     registrar.addMethodCallDelegate(instance, channel: channel)
   }
 

plugins/color_panel/macos/Classes/ColorPanelPlugin.m renamed to plugins/color_panel/macos/Classes/FLEColorPanelPlugin.m

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'example_plugin'
-  s.version          = '0.0.2'
+  s.version          = '0.0.3'
   s.summary          = 'A new flutter plugin project.'
   s.description      = <<-DESC
 A new flutter plugin project.
@@ -13,10 +13,9 @@ A new flutter plugin project.
   s.author           = { 'Your Company' => 'email@example.com' }
   s.source           = { :path => '.' }
   s.source_files     = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
   s.dependency 'FlutterMacOS'
 
   s.platform = :osx
-  s.osx.deployment_target = '10.9'
+  s.osx.deployment_target = '10.12'
 end
 

plugins/color_panel/macos/color_panel.podspec

@@ -6,7 +6,9 @@ homepage:
 
 flutter:
   plugin:
-    macosPrefix: FDE
+    # Currently macosPrefix is used to indicate macOS support, but the value is
+    # not actually used. See https://github.com/flutter/flutter/issues/33597
+    macosPrefix: unused
     pluginClass: ExamplePlugin
 
 environment:

plugins/example_plugin/macos/Classes/SwiftExamplePlugin.swift renamed to plugins/example_plugin/macos/Classes/ExamplePlugin.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FileChooserPlugin.h"
+#import "FLEFileChooserPlugin.h"
 
 #import <AppKit/AppKit.h>
 

plugins/example_plugin/macos/example_plugin.podspec

@@ -0,0 +1,22 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import FlutterMacOS
+import Foundation
+
+public class FileChooserPlugin: NSObject, FlutterPlugin {
+  public static func register(with registrar: FlutterPluginRegistrar) {
+    FLEFileChooserPlugin.register(with: registrar)
+  }
+}

plugins/example_plugin/pubspec.yaml

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'file_chooser'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'Displays macOS open and save panels.'
   s.description      = <<-DESC
 Displays macOS open and save panels.
@@ -13,10 +13,9 @@ Displays macOS open and save panels.
   s.author           = { 'Flutter Desktop Embedding Developers' => 'flutter-desktop-embedding-dev@googlegroups.com' }
   s.source           = { :path => '.' }
   s.source_files     = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
   s.dependency 'FlutterMacOS'
 
   s.platform = :osx
-  s.osx.deployment_target = '10.9'
+  s.osx.deployment_target = '10.12'
 end
 

plugins/file_chooser/macos/Classes/FileChooserPlugin.h renamed to plugins/file_chooser/macos/Classes/FLEFileChooserPlugin.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MenubarPlugin.h"
+#import "FLEMenubarPlugin.h"
 
 // See menu_channel.dart for documentation.
 static NSString *const kChannelName = @"flutter/menubar";

plugins/file_chooser/macos/Classes/FileChooserPlugin.m renamed to plugins/file_chooser/macos/Classes/FLEFileChooserPlugin.m

@@ -12,13 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import <Foundation/Foundation.h>
+import FlutterMacOS
+import Foundation
 
-#import <FlutterMacOS/FlutterMacOS.h>
-
-/**
- * An example Flutter plugin for macOS.
- */
-@interface FDEExamplePlugin : NSObject <FlutterPlugin>
-
-@end
+public class MenubarPlugin: NSObject, FlutterPlugin {
+  public static func register(with registrar: FlutterPluginRegistrar) {
+    FLEMenubarPlugin.register(with: registrar)
+  }
+}

plugins/file_chooser/macos/Classes/FileChooserPlugin.swift

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'menubar'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'Provides the ability to add menubar items with Dart callbacks.'
   s.description      = <<-DESC
 Provides the ability to add menubar items with Dart callbacks.
@@ -13,10 +13,9 @@ Provides the ability to add menubar items with Dart callbacks.
   s.author           = { 'Flutter Desktop Embedding Developers' => 'flutter-desktop-embedding-dev@googlegroups.com' }
   s.source           = { :path => '.' }
   s.source_files     = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
   s.dependency 'FlutterMacOS'
 
   s.platform = :osx
-  s.osx.deployment_target = '10.9'
+  s.osx.deployment_target = '10.12'
 end
 

plugins/file_chooser/macos/file_chooser.podspec

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "WindowSizePlugin.h"
+#import "FLEWindowSizePlugin.h"
 
 #import <AppKit/AppKit.h>
 

plugins/menubar/macos/Classes/MenubarPlugin.h renamed to plugins/menubar/macos/Classes/FLEMenubarPlugin.h

@@ -0,0 +1,22 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import FlutterMacOS
+import Foundation
+
+public class WindowSizePlugin: NSObject, FlutterPlugin {
+  public static func register(with registrar: FlutterPluginRegistrar) {
+    FLEWindowSizePlugin.register(with: registrar)
+  }
+}

plugins/menubar/macos/Classes/MenubarPlugin.m renamed to plugins/menubar/macos/Classes/FLEMenubarPlugin.m

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'window_size'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'Allows resizing and repositioning the window containing Flutter.'
   s.description      = <<-DESC
 Allows resizing and repositioning the window containing Flutter.
@@ -13,10 +13,9 @@ Allows resizing and repositioning the window containing Flutter.
   s.author           = { 'Flutter Desktop Embedding Developers' => 'flutter-desktop-embedding-dev@googlegroups.com' }
   s.source           = { :path => '.' }
   s.source_files     = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
   s.dependency 'FlutterMacOS'
 
   s.platform = :osx
-  s.osx.deployment_target = '10.9'
+  s.osx.deployment_target = '10.12'
 end