removed obj-c plugin wrapper

urbanairship · Jan 6, 2025 · dce40a2 · dce40a2
1 parent 7b12ec2
commit dce40a2
Show file tree

Hide file tree

Showing 12 changed files with 102 additions and 83 deletions.
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/ios/airship_flutter.podspec b/ios/airship_flutter.podspec
@@ -17,11 +17,10 @@ Airship flutter plugin.
   s.author           = { 'Airship' => '[email protected]' }
   s.source           = { :path => '.' }
   s.source_files = 'airship_flutter/Sources/airship_flutter/**/*'
-  s.public_header_files = 'airship_flutter/Sources/airship_flutter/obj-c/**/*.h'
   s.dependency 'Flutter'
   s.ios.deployment_target      = "14.0"
   s.dependency "AirshipFrameworkProxy", "11.1.0"
   s.swift_version = "5.0.0"
-  s.resource_bundles = {'airship_flutter_privacy' => ['airship_flutter/Sources/airship_flutter/swift/PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'airship_flutter_privacy' => ['airship_flutter/Sources/airship_flutter/PrivacyInfo.xcprivacy']}
 end
 
diff --git a/ios/airship_flutter/Package.swift b/ios/airship_flutter/Package.swift
@@ -13,18 +13,11 @@ let package = Package(
         .package(url: "https://github.com/urbanairship/airship-mobile-framework-proxy.git", from: "11.2.1")
     ],
     targets: [
-        .target(
-            name: "airship_flutter_objc",
-            path: "Sources/airship_flutter/obj-c",
-            publicHeadersPath: "include"
-        ),
         .target(
             name: "airship_flutter",
             dependencies: [
-                "airship_flutter_objc",
                 .product(name: "AirshipFrameworkProxy", package: "airship-mobile-framework-proxy")
             ],
-            path: "Sources/airship_flutter/swift",
             resources: [
                  .process("PrivacyInfo.xcprivacy")
             ]

diff --git a/...ship_flutter/swift/AirshipAutopilot.swift → ...es/airship_flutter/AirshipAutopilot.swift b/...ship_flutter/swift/AirshipAutopilot.swift → ...es/airship_flutter/AirshipAutopilot.swift
@@ -1,7 +1,12 @@
 import Flutter
-import AirshipKit
 import AirshipFrameworkProxy
 
+#if canImport(AirshipCore)
+import AirshipCore
+#else
+import AirshipKit
+#endif
+
 public class AirshipAutopilot: NSObject {
 
     @objc

diff --git a/...p_flutter/swift/AirshipEmbeddedView.swift → ...airship_flutter/AirshipEmbeddedView.swift b/...p_flutter/swift/AirshipEmbeddedView.swift → ...airship_flutter/AirshipEmbeddedView.swift
@@ -1,6 +1,12 @@
 import Foundation
-import AirshipKit
 import SwiftUI
+import Flutter
+
+#if canImport(AirshipCore)
+import AirshipCore
+#else
+import AirshipKit
+#endif
 
 class AirshipEmbeddedViewFactory: NSObject, FlutterPlatformViewFactory {
     let registrar: FlutterPluginRegistrar

diff --git a/...utter/swift/AirshipInboxMessageView.swift → ...hip_flutter/AirshipInboxMessageView.swift b/...utter/swift/AirshipInboxMessageView.swift → ...hip_flutter/AirshipInboxMessageView.swift
@@ -1,6 +1,12 @@
 import Foundation
-import AirshipKit
 import WebKit
+import Flutter
+
+#if canImport(AirshipCore)
+import AirshipCore
+#else
+import AirshipKit
+#endif
 
 class AirshipInboxMessageViewFactory : NSObject, FlutterPlatformViewFactory {
 

diff --git a/...ip_flutter/swift/SwiftAirshipPlugin.swift → ...urces/airship_flutter/AirshipPlugin.swift b/...ip_flutter/swift/SwiftAirshipPlugin.swift → ...urces/airship_flutter/AirshipPlugin.swift
@@ -1,10 +1,15 @@
 import Flutter
 import UIKit
-import AirshipKit
 import AirshipFrameworkProxy
 import Combine
 
-public class SwiftAirshipPlugin: NSObject, FlutterPlugin {
+#if canImport(AirshipCore)
+import AirshipCore
+#else
+import AirshipKit
+#endif
+
+public class AirshipPlugin: NSObject, FlutterPlugin {
     private static let eventNames: [AirshipProxyEventType: String] = [
         .authorizedNotificationSettingsChanged: "com.airship.flutter/event/ios_authorized_notification_settings_changed",
         .pushTokenReceived: "com.airship.flutter/event/push_token_received",
@@ -21,18 +26,18 @@ public class SwiftAirshipPlugin: NSObject, FlutterPlugin {
 
     private let streams: [AirshipProxyEventType: AirshipEventStream] = {
         var streams: [AirshipProxyEventType: AirshipEventStream] = [:]
-        SwiftAirshipPlugin.eventNames.forEach { (key: AirshipProxyEventType, value: String) in
+        AirshipPlugin.eventNames.forEach { (key: AirshipProxyEventType, value: String) in
             streams[key] = AirshipEventStream(key, name: value)
         }
         return streams
     }()
 
     private var subscriptions = Set<AnyCancellable>()
 
-    static let shared = SwiftAirshipPlugin()
+    static let shared = AirshipPlugin()
 
     public static func register(with registrar: FlutterPluginRegistrar) {
-        SwiftAirshipPlugin.shared.setup(registrar: registrar)
+        AirshipPlugin.shared.setup(registrar: registrar)
     }
 
     private func setup(registrar: FlutterPluginRegistrar) {

diff --git a/...p_flutter/swift/AirshipPluginLoader.swift → ...airship_flutter/AirshipPluginLoader.swift b/...p_flutter/swift/AirshipPluginLoader.swift → ...airship_flutter/AirshipPluginLoader.swift
@@ -1,4 +1,5 @@
 import AirshipFrameworkProxy
+import UIKit
 
 @objc(AirshipPluginLoader)
 public class AirshipPluginLoader: NSObject, AirshipPluginLoaderProtocol {

diff --git a/..._flutter/swift/AirshipPluginVersion.swift → ...irship_flutter/AirshipPluginVersion.swift b/..._flutter/swift/AirshipPluginVersion.swift → ...irship_flutter/AirshipPluginVersion.swift
diff --git a/...rship_flutter/swift/PrivacyInfo.xcprivacy → ...ces/airship_flutter/PrivacyInfo.xcprivacy b/...rship_flutter/swift/PrivacyInfo.xcprivacy → ...ces/airship_flutter/PrivacyInfo.xcprivacy
diff --git a/ios/airship_flutter/Sources/airship_flutter/obj-c/AirshipPlugin.m b/ios/airship_flutter/Sources/airship_flutter/obj-c/AirshipPlugin.m
diff --git a/ios/airship_flutter/Sources/airship_flutter/obj-c/include/AirshipPlugin.h b/ios/airship_flutter/Sources/airship_flutter/obj-c/include/AirshipPlugin.h