diff --git a/packages/mixpanel_flutter/ios/Classes/MixpanelFlutterPlugin.h b/packages/mixpanel_flutter/ios/Classes/MixpanelFlutterPlugin.h deleted file mode 100644 index 3f615430..00000000 --- a/packages/mixpanel_flutter/ios/Classes/MixpanelFlutterPlugin.h +++ /dev/null @@ -1,4 +0,0 @@ -#import - -@interface MixpanelFlutterPlugin : NSObject -@end diff --git a/packages/mixpanel_flutter/ios/Classes/MixpanelFlutterPlugin.m b/packages/mixpanel_flutter/ios/Classes/MixpanelFlutterPlugin.m deleted file mode 100644 index 0db539aa..00000000 --- a/packages/mixpanel_flutter/ios/Classes/MixpanelFlutterPlugin.m +++ /dev/null @@ -1,15 +0,0 @@ -#import "MixpanelFlutterPlugin.h" -#if __has_include() -#import -#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 "mixpanel_flutter-Swift.h" -#endif - -@implementation MixpanelFlutterPlugin -+ (void)registerWithRegistrar:(NSObject*)registrar { - [SwiftMixpanelFlutterPlugin registerWithRegistrar:registrar]; -} -@end diff --git a/packages/mixpanel_flutter/ios/Classes/MixpanelTypeHandler.swift b/packages/mixpanel_flutter/ios/Classes/MixpanelTypeHandler.swift deleted file mode 120000 index 0642a4a4..00000000 --- a/packages/mixpanel_flutter/ios/Classes/MixpanelTypeHandler.swift +++ /dev/null @@ -1 +0,0 @@ -../../swift/Classes/MixpanelTypeHandler.swift \ No newline at end of file diff --git a/packages/mixpanel_flutter/ios/Classes/SwiftMixpanelFlutterPlugin.swift b/packages/mixpanel_flutter/ios/Classes/SwiftMixpanelFlutterPlugin.swift deleted file mode 120000 index 4eb68a61..00000000 --- a/packages/mixpanel_flutter/ios/Classes/SwiftMixpanelFlutterPlugin.swift +++ /dev/null @@ -1 +0,0 @@ -../../swift/Classes/SwiftMixpanelFlutterPlugin.swift \ No newline at end of file diff --git a/packages/mixpanel_flutter/ios/mixpanel_flutter.podspec b/packages/mixpanel_flutter/ios/mixpanel_flutter.podspec index 6e404be9..939c5da5 100644 --- a/packages/mixpanel_flutter/ios/mixpanel_flutter.podspec +++ b/packages/mixpanel_flutter/ios/mixpanel_flutter.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.author = { 'Mixpanel, Inc' => 'support@mixpanel.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source_files = 'mixpanel_flutter/Sources/mixpanel_flutter/**/*.swift' s.dependency 'Flutter' s.dependency 'Mixpanel-swift', '6.4.0' s.platform = :ios, '13.0' diff --git a/packages/mixpanel_flutter/ios/mixpanel_flutter/Package.swift b/packages/mixpanel_flutter/ios/mixpanel_flutter/Package.swift new file mode 100644 index 00000000..ffaafa13 --- /dev/null +++ b/packages/mixpanel_flutter/ios/mixpanel_flutter/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "mixpanel_flutter", + platforms: [ + .iOS("13.0") + ], + products: [ + .library( + name: "mixpanel-flutter", + targets: ["mixpanel_flutter"] + ) + ], + dependencies: [ + .package( + url: "https://github.com/mixpanel/mixpanel-swift.git", + exact: "6.4.0" + ) + ], + targets: [ + .target( + name: "mixpanel_flutter", + dependencies: [ + .product(name: "Mixpanel", package: "mixpanel-swift") + ], + path: "Sources/mixpanel_flutter", + resources: [] + ) + ] +) diff --git a/packages/mixpanel_flutter/ios/mixpanel_flutter/Sources/mixpanel_flutter/MixpanelTypeHandler.swift b/packages/mixpanel_flutter/ios/mixpanel_flutter/Sources/mixpanel_flutter/MixpanelTypeHandler.swift new file mode 120000 index 00000000..2dd30312 --- /dev/null +++ b/packages/mixpanel_flutter/ios/mixpanel_flutter/Sources/mixpanel_flutter/MixpanelTypeHandler.swift @@ -0,0 +1 @@ +../../../../swift/Classes/MixpanelTypeHandler.swift \ No newline at end of file diff --git a/packages/mixpanel_flutter/ios/mixpanel_flutter/Sources/mixpanel_flutter/SwiftMixpanelFlutterPlugin.swift b/packages/mixpanel_flutter/ios/mixpanel_flutter/Sources/mixpanel_flutter/SwiftMixpanelFlutterPlugin.swift new file mode 120000 index 00000000..2287cd73 --- /dev/null +++ b/packages/mixpanel_flutter/ios/mixpanel_flutter/Sources/mixpanel_flutter/SwiftMixpanelFlutterPlugin.swift @@ -0,0 +1 @@ +../../../../swift/Classes/SwiftMixpanelFlutterPlugin.swift \ No newline at end of file diff --git a/packages/mixpanel_flutter/swift/Classes/SwiftMixpanelFlutterPlugin.swift b/packages/mixpanel_flutter/swift/Classes/SwiftMixpanelFlutterPlugin.swift index 13161ae2..d7ccb055 100644 --- a/packages/mixpanel_flutter/swift/Classes/SwiftMixpanelFlutterPlugin.swift +++ b/packages/mixpanel_flutter/swift/Classes/SwiftMixpanelFlutterPlugin.swift @@ -9,6 +9,7 @@ import Mixpanel public typealias MixpanelFlutterPlugin = SwiftMixpanelFlutterPlugin #endif +@objc(MixpanelFlutterPlugin) public class SwiftMixpanelFlutterPlugin: NSObject, FlutterPlugin { private var instance: MixpanelInstance?