@capacitor/ios 9.0.0-alpha.6 → 9.0.0-alpha.7

package/{Capacitor → Sources}/Capacitor/CapacitorBridge.swift

@@ -95,8 +95,6 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
     public static let capacitorSite = "https://capacitorjs.com/"
     public static let fileStartIdentifier = "/_capacitor_file_"
     public static let httpInterceptorStartIdentifier = "/_capacitor_http_interceptor_"
-    @available(*, deprecated, message: "`httpsInterceptorStartIdentifier` is no longer required. All proxied requests are handled via `httpInterceptorStartIdentifier` instead")
-    public static let httpsInterceptorStartIdentifier = "/_capacitor_https_interceptor_"
     public static let httpInterceptorUrlParam = "u"
     public static let defaultScheme = "capacitor"
 
@@ -125,47 +123,6 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
     // Array of block based observers
     var observers: [NSObjectProtocol] = []
 
-    // MARK: - CAPBridgeProtocol: Deprecated
-
-    public func getWebView() -> WKWebView? {
-        return webView
-    }
-
-    public func isSimulator() -> Bool {
-        return isSimEnvironment
-    }
-
-    public func isDevMode() -> Bool {
-        return isDevEnvironment
-    }
-
-    public func getStatusBarVisible() -> Bool {
-        return statusBarVisible
-    }
-
-    @nonobjc public func setStatusBarVisible(_ visible: Bool) {
-        statusBarVisible = visible
-    }
-
-    public func getStatusBarStyle() -> UIStatusBarStyle {
-        return statusBarStyle
-    }
-    @nonobjc public func setStatusBarStyle(_ style: UIStatusBarStyle) {
-        statusBarStyle = style
-    }
-
-    public func getUserInterfaceStyle() -> UIUserInterfaceStyle {
-        return userInterfaceStyle
-    }
-
-    public func getLocalUrl() -> String {
-        return config.localURL.absoluteString
-    }
-
-    @nonobjc public func setStatusBarAnimation(_ animation: UIStatusBarAnimation) {
-        statusBarAnimation = animation
-    }
-
     public func setServerBasePath(_ path: String) {
         let url = URL(fileURLWithPath: path, isDirectory: true)
         guard FileManager.default.fileExists(atPath: url.path) else { return }
@@ -198,11 +155,6 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
 
     // MARK: - Initialization
 
-    @available(*, deprecated, renamed: "init", message: "Use different init")
-    public convenience init(with configuration: InstanceConfiguration, delegate bridgeDelegate: CAPBridgeDelegate, cordovaConfiguration: Any, assetHandler: WebViewAssetHandler, delegationHandler: WebViewDelegationHandler, autoRegisterPlugins: Bool = true) {
-        self.init(with: configuration, delegate: bridgeDelegate, assetHandler: assetHandler, delegationHandler: delegationHandler, autoRegisterPlugins: autoRegisterPlugins)
-    }
-
     public init(with configuration: InstanceConfiguration, delegate bridgeDelegate: CAPBridgeDelegate, assetHandler: WebViewAssetHandler, delegationHandler: WebViewDelegationHandler, autoRegisterPlugins: Bool = true) {
 
         self.bridgeDelegate = bridgeDelegate
@@ -215,6 +167,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         super.init()
 
         self.webViewDelegationHandler.bridge = self
+        self.webViewAssetHandler.setConfiguration(configuration)
 
         exportCoreJS(localUrl: configuration.localURL.absoluteString)
         registerPlugins()
@@ -261,26 +214,50 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         if !cordovaIsPresent {
             observers.append(
                 NotificationCenter.default.addObserver(
-                    forName: UIApplication.willEnterForegroundNotification,
+                    forName: UIScene.willEnterForegroundNotification,
                     object: nil,
                     queue: .main
-                ) { [weak self] _ in
-                    self?.triggerDocumentJSEvent(eventName: "resume")
+                ) { [weak self] notification in
+                    self?.triggerSceneLifecycleJSEvent("resume", for: notification)
                 }
             )
 
             observers.append(
                 NotificationCenter.default.addObserver(
-                    forName: UIApplication.didEnterBackgroundNotification,
+                    forName: UIScene.didEnterBackgroundNotification,
                     object: nil,
                     queue: .main
-                ) { [weak self] _ in
-                    self?.triggerDocumentJSEvent(eventName: "pause")
+                ) { [weak self] notification in
+                    self?.triggerSceneLifecycleJSEvent("pause", for: notification)
                 }
             )
         }
     }
 
+    /**
+     Forward a scene lifecycle transition to the page as a document event, but only once
+     the page exists to receive it.
+
+     On a cold start `UIScene.willEnterForegroundNotification` is posted while the initial
+     load is still in flight, before `window.Capacitor` has been defined. Evaluating
+     `triggerEvent` at that point throws inside the web view and surfaces as a
+     "JS Eval error" in the log. The same happens when the web content process was
+     terminated and the page is being reloaded. In both cases the page is about to load
+     from scratch, so there is nothing for it to resume or pause; the event is dropped
+     rather than deferred, because a "resume" delivered right after a fresh load would
+     make the page react to a transition it never went through.
+     */
+    private func triggerSceneLifecycleJSEvent(_ eventName: String, for notification: Notification) {
+        guard let scene = notification.object as? UIWindowScene,
+              scene === viewController?.view.window?.windowScene else {
+            return
+        }
+        guard case .subsequentLoad = webViewDelegationHandler.webViewLoadingState, webView?.isLoading == false else {
+            return
+        }
+        triggerDocumentJSEvent(eventName: eventName)
+    }
+
     /**
      Reset the state of the bridge between navigations to avoid
      sending data back to the page from a previous page.
@@ -403,16 +380,6 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         _ = storedCalls.withLock { $0.removeValue(forKey: withID) }
     }
 
-    // MARK: - Deprecated Versions
-
-    @objc public func getSavedCall(_ callbackId: String) -> CAPPluginCall? {
-        return savedCall(withID: callbackId)
-    }
-
-    @objc public func releaseCall(callbackId: String) {
-        releaseCall(withID: callbackId)
-    }
-
     // MARK: - Internal
 
     func getDispatchQueue() -> DispatchQueue {
@@ -420,7 +387,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
     }
 
     func reload() {
-        self.getWebView()?.reload()
+        self.webView?.reload()
     }
 
     func docLink(_ url: String) -> String {
@@ -491,7 +458,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
                                             if let result = result {
                                                 self?.toJs(result: JSResult(call: call, callResult: result), save: pluginCall?.keepAlive ?? false)
                                             } else {
-                                                self?.toJs(result: JSResult(call: call, result: .dictionary([:])), save: pluginCall?.keepAlive ?? false)
+                                                self?.toJs(result: JSResult(call: call, data: [:]), save: pluginCall?.keepAlive ?? false)
                                             }
                                            }, error: {(error: CAPPluginCallError?) in
                                             if let error = error {
@@ -501,7 +468,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
                                                                                      errorMessage: "",
                                                                                      errorDescription: "",
                                                                                      errorCode: nil,
-                                                                                     result: .dictionary([:])))
+                                                                                     data: [:]))
                                             }
                                            })
 
@@ -589,7 +556,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         """
 
         DispatchQueue.main.async {
-            self.getWebView()?.evaluateJavaScript(wrappedJs, completionHandler: { (_, error) in
+            self.webView?.evaluateJavaScript(wrappedJs, completionHandler: { (_, error) in
                 if let error = error {
                     CAPLog.print("⚡️  JS Eval error", error.localizedDescription)
                 }
@@ -605,7 +572,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
     // swiftlint:disable:next identifier_name
     @objc public func eval(js: String) {
         DispatchQueue.main.async {
-            self.getWebView()?.evaluateJavaScript(js, completionHandler: { (_, error) in
+            self.webView?.evaluateJavaScript(js, completionHandler: { (_, error) in
                 if let error = error {
                     CAPLog.print("⚡️  JS Eval error", error.localizedDescription)
                 }
@@ -639,7 +606,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
 
     public func logToJs(_ message: String, _ level: String = "log") {
         DispatchQueue.main.async {
-            self.getWebView()?.evaluateJavaScript("window.Capacitor.logJs('\(message)', '\(level)')") { (result, error) in
+            self.webView?.evaluateJavaScript("window.Capacitor.logJs('\(message)', '\(level)')") { (result, error) in
                 if error != nil, let result = result {
                     CAPLog.print(result)
                 }
@@ -695,12 +662,4 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         alert.addAction(UIAlertAction(title: buttonTitle, style: UIAlertAction.Style.default, handler: nil))
         self.viewController?.present(alert, animated: true, completion: nil)
     }
-
-    @objc open func presentVC(_ viewControllerToPresent: UIViewController, animated flag: Bool, completion: (() -> Void)? = nil) {
-        self.viewController?.present(viewControllerToPresent, animated: flag, completion: completion)
-    }
-
-    @objc open func dismissVC(animated flag: Bool, completion: (() -> Void)? = nil) {
-        self.viewController?.dismiss(animated: flag, completion: completion)
-    }
 }

package/Sources/Capacitor/CapacitorObjCExports.swift

@@ -0,0 +1,11 @@
+// The Objective-C base classes (CAPPlugin, CAPPluginCall, CAPPluginMethod, CAPBridgedPlugin,
+// CAPInstanceDescriptor, CAPInstanceConfiguration) live in the CapacitorObjC target so that they
+// compile before the Swift module that subclasses and extends them. Re-export them so the rest of
+// this module — and downstream `import Capacitor` consumers — keep seeing these symbols without an
+// explicit `import CapacitorObjC`.
+//
+// Under CocoaPods all of these sources are compiled into a single Capacitor module, so there is no
+// CapacitorObjC module to import and the re-export is unnecessary.
+#if SWIFT_PACKAGE
+@_exported import CapacitorObjC
+#endif

package/{Capacitor → Sources}/Capacitor/JS.swift

@@ -1,16 +1,5 @@
 import Foundation
 
-public class JSDate {
-    @available(*, deprecated, message: "No longer needed. Dates will be mapped to strings during serialization.")
-    static func toString(_ date: Date) -> String {
-        let formatter = ISO8601DateFormatter()
-        return formatter.string(from: date)
-    }
-}
-
-@available(*, deprecated, renamed: "PluginCallResultData")
-public typealias JSResultBody = [String: Any]
-
 /**
  * A call originating from JavaScript land
  */
@@ -55,17 +44,17 @@ private enum SerializationResult: String {
 
 internal struct JSResult: JSResultProtocol {
     let call: JSCall
-    let result: PluginCallResult?
+    let data: PluginCallResultData?
 
     func jsonPayload() -> String {
-        guard let result = result else {
+        guard let data = data else {
             return SerializationResult.undefined.rawValue
         }
         do {
-            if let payload = try result.jsonRepresentation() {
+            if let payload = try JSResultSerialization.jsonRepresentation(of: data) {
                 return payload
             }
-        } catch PluginCallResult.SerializationError.invalidObject {
+        } catch JSResultSerialization.SerializationError.invalidObject {
             CAPLog.print("[Capacitor Plugin Error] - \(call.pluginId) - \(call.method) - Unable to serialize plugin response as JSON." +
                             "Ensure that all data passed to success callback from module method is JSON serializable!")
         } catch {
@@ -78,7 +67,7 @@ internal struct JSResult: JSResultProtocol {
 internal extension JSResult {
     init(call: JSCall, callResult: CAPPluginCallResult) {
         self.call = call
-        self.result = callResult.resultData
+        self.data = callResult.data
     }
 }
 
@@ -87,7 +76,7 @@ internal struct JSResultError: JSResultProtocol {
     let errorMessage: String
     let errorDescription: String
     let errorCode: String?
-    let result: PluginCallResult
+    let data: PluginCallResultData
 
     func jsonPayload() -> String {
         var errorDictionary: [String: Any] = [
@@ -97,11 +86,11 @@ internal struct JSResultError: JSResultProtocol {
         errorDictionary["code"] = self.errorCode
 
         do {
-            if let payload = try result.jsonRepresentation(includingFields: errorDictionary) {
+            if let payload = try JSResultSerialization.jsonRepresentation(of: data, includingFields: errorDictionary) {
                 CAPLog.print("ERROR MESSAGE: ", payload.prefix(512))
                 return payload
             }
-        } catch PluginCallResult.SerializationError.invalidObject {
+        } catch JSResultSerialization.SerializationError.invalidObject {
             CAPLog.print("[Capacitor Plugin Error] - \(call.pluginId) - \(call.method) - Unable to serialize plugin response as JSON." +
                             "Ensure that all data passed to success callback from module method is JSON serializable!")
         } catch {
@@ -117,6 +106,6 @@ internal extension JSResultError {
         errorMessage = callError.message
         errorDescription = callError.error?.localizedDescription ?? ""
         errorCode = callError.code
-        result = callError.resultData ?? .dictionary([:])
+        data = callError.data ?? [:]
     }
 }

package/{Capacitor → Sources}/Capacitor/JSExport.swift

@@ -22,8 +22,12 @@ internal class JSExport {
     }
 
     static func exportBridgeJS(userContentController: WKUserContentController) throws {
-        let capBundle = Bundle(for: Self.self)
-        guard let jsUrl = capBundle.url(forResource: "native-bridge", withExtension: "js") else {
+        #if SWIFT_PACKAGE
+        let jsUrl = Bundle.module.url(forResource: "native-bridge", withExtension: "js", subdirectory: "assets")
+        #else
+        let jsUrl = Bundle(for: Self.self).url(forResource: "native-bridge", withExtension: "js")
+        #endif
+        guard let jsUrl else {
             CAPLog.print("ERROR: Required native-bridge.js file in Capacitor not found. Bridge will not function!")
             throw CapacitorBridgeError.errorExportingCoreJS
         }

package/Sources/Capacitor/JSResultSerialization.swift

@@ -0,0 +1,56 @@
+import Foundation
+
+public typealias PluginCallResultData = [String: Any]
+
+/// Serializes a plugin call's result dictionary to the JSON string sent back across the bridge,
+/// converting `Date` values to ISO8601 strings (recursively through nested dictionaries/arrays).
+///
+/// Carries the serialization logic that used to live on the `PluginCallResult` enum, which was
+/// replaced by the Objective-C `CAPPluginCallResult`/`CAPPluginCallError` carriers. Those store
+/// their payloads as plain dictionaries, so the logic no longer has an enum to hang off.
+enum JSResultSerialization {
+    enum SerializationError: Error {
+        case invalidObject
+    }
+
+    private static let formatter = ISO8601DateFormatter()
+
+    static func jsonRepresentation(of dictionary: PluginCallResultData, includingFields: PluginCallResultData? = nil) throws -> String? {
+        var dictionary = dictionary
+        if let fields = includingFields {
+            dictionary.merge(fields) { (current, _) in current }
+        }
+        let prepared = prepare(dictionary: dictionary)
+        guard JSONSerialization.isValidJSONObject(prepared) else {
+            throw SerializationError.invalidObject
+        }
+        let data = try JSONSerialization.data(withJSONObject: prepared, options: [])
+        return String(data: data, encoding: .utf8)
+    }
+
+    private static func prepare(dictionary: PluginCallResultData) -> PluginCallResultData {
+        return dictionary.mapValues { (value) -> Any in
+            if let date = value as? Date {
+                return formatter.string(from: date)
+            } else if let aDictionary = value as? PluginCallResultData {
+                return prepare(dictionary: aDictionary)
+            } else if let anArray = value as? [Any] {
+                return prepare(array: anArray)
+            }
+            return value
+        }
+    }
+
+    private static func prepare(array: [Any]) -> [Any] {
+        return array.map { (value) -> Any in
+            if let date = value as? Date {
+                return formatter.string(from: date)
+            } else if let aDictionary = value as? PluginCallResultData {
+                return prepare(dictionary: aDictionary)
+            } else if let anArray = value as? [Any] {
+                return prepare(array: anArray)
+            }
+            return value
+        }
+    }
+}

package/{Capacitor → Sources}/Capacitor/NotificationRouter.swift

@@ -1,11 +1,20 @@
 import Foundation
 
 @objc(CAPNotificationRouter) public class NotificationRouter: NSObject, UNUserNotificationCenterDelegate {
+    // UNUserNotificationCenter.current() raises when the process has no application bundle, which
+    // is the case in a host-less unit test runner and some extension contexts. There is no
+    // notification center to register with there, so treat it as unavailable rather than trapping.
+    private static var isNotificationCenterAvailable: Bool {
+        return ["app", "appex"].contains(Bundle.main.bundleURL.pathExtension)
+    }
+
     var handleApplicationNotifications: Bool {
         get {
+            guard Self.isNotificationCenterAvailable else { return false }
             return UNUserNotificationCenter.current().delegate === self
         }
         set {
+            guard Self.isNotificationCenterAvailable else { return }
             let center = UNUserNotificationCenter.current()
 
             if newValue {

package/Sources/Capacitor/PluginCallResult.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+public enum PluginCallResult {
+    case dictionary(PluginCallResultData)
+}
+
+public extension CAPPluginCallResult {
+    var resultData: PluginCallResult? {
+        return data.map { .dictionary($0) }
+    }
+}
+
+public extension CAPPluginCallError {
+    var resultData: PluginCallResult? {
+        return data.map { .dictionary($0) }
+    }
+}

package/{Capacitor → Sources}/Capacitor/Plugins/CapacitorUrlRequest.swift

@@ -12,8 +12,8 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         request = URLRequest(url: url)
         request.httpMethod = method
         headers = [:]
-        if let lang = Locale.autoupdatingCurrent.languageCode {
-            if let country = Locale.autoupdatingCurrent.regionCode {
+        if let lang = Locale.autoupdatingCurrent.language.languageCode?.identifier {
+            if let country = Locale.autoupdatingCurrent.region?.identifier {
                 headers["Accept-Language"] = "\(lang)-\(country),\(lang);q=0.5"
             } else {
                 headers["Accept-Language"] = "\(lang);q=0.5"
@@ -195,15 +195,6 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         }
     }
 
-    @available(*, deprecated, message: "Use newer function with passed headers of type [String: Any]")
-    public func setRequestHeaders(_ headers: [String: String]) {
-        headers.keys.forEach { (key: String) in
-            let value = headers[key]
-            request.addValue(value!, forHTTPHeaderField: key)
-            self.headers[key] = value
-        }
-    }
-
     public func setRequestHeaders(_ headers: [String: Any]) {
         headers.keys.forEach { (key: String) in
             let value = headers[key]

package/{Capacitor → Sources}/Capacitor/WebViewAssetHandler.swift

@@ -6,6 +6,7 @@ import UniformTypeIdentifiers
 open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
     private var router: Router
     private var serverUrl: URL?
+    private var configuration: InstanceConfiguration?
 
     public init(router: Router) {
         self.router = router
@@ -20,6 +21,10 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
         self.serverUrl = serverUrl
     }
 
+    open func setConfiguration(_ configuration: InstanceConfiguration?) {
+        self.configuration = configuration
+    }
+
     private func isUsingLiveReload(_ localUrl: URL) -> Bool {
         return self.serverUrl != nil && self.serverUrl?.scheme != localUrl.scheme
     }
@@ -31,7 +36,13 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
         let localUrl = URL.init(string: url.absoluteString)!
 
         if url.path.starts(with: CapacitorBridge.httpInterceptorStartIdentifier) {
-            handleCapacitorHttpRequest(urlSchemeTask, localUrl, false)
+            // Only serve the proxy when CapacitorHttp is on. A scheme task can't tell a document from
+            // a subresource, so keeping documents out relies on the check in decidePolicyFor.
+            if configuration?.getPluginConfig("CapacitorHttp").getBoolean("enabled", false) == true {
+                handleCapacitorHttpRequest(urlSchemeTask, localUrl, false)
+            } else {
+                urlSchemeTask.didFailWithError(URLError(.unsupportedURL))
+            }
             return
         }
 
@@ -152,12 +163,13 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
                     let existingHeaders = response.allHeaderFields
                     var newHeaders: [AnyHashable: Any] = [:]
 
+                    // Nothing should render this. If anything does, sandbox keeps it inert.
+                    newHeaders["Content-Security-Policy"] = "sandbox; frame-ancestors 'none'"
+
                     // if using live reload, then set CORS headers
                     if self.isUsingLiveReload(url) {
-                        newHeaders = [
-                            "Access-Control-Allow-Origin": self.serverUrl?.absoluteString ?? "",
-                            "Access-Control-Allow-Methods": "GET, HEAD, OPTIONS, TRACE"
-                        ]
+                        newHeaders["Access-Control-Allow-Origin"] = self.serverUrl?.absoluteString ?? ""
+                        newHeaders["Access-Control-Allow-Methods"] = "GET, HEAD, OPTIONS, TRACE"
                     }
 
                     if let mergedHeaders = existingHeaders.merging(newHeaders, uniquingKeysWith: { (_, newHeaders) in newHeaders }) as? [String: String] {

package/{Capacitor → Sources}/Capacitor/WebViewDelegationHandler.swift

@@ -74,6 +74,12 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
             return
         }
 
+        // The proxy returns a remote body at the app origin, so block it before plugins can allow it.
+        if navURL.path.starts(with: CapacitorBridge.httpInterceptorStartIdentifier) {
+            decisionHandler(.cancel)
+            return
+        }
+
         // first, give plugins the chance to handle the decision
         for pluginObject in bridge.plugins {
             let plugin = pluginObject.value
@@ -107,7 +113,7 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
 
         if !isApplicationNavigation, toplevelNavigation {
             // disallow and let the system handle it
-            if UIApplication.shared.applicationState == .active {
+            if webView.window?.windowScene?.activationState == .foregroundActive {
                 UIApplication.shared.open(navURL, options: [:], completionHandler: nil)
             }
             decisionHandler(.cancel)

package/{Capacitor → Sources}/Capacitor/assets/native-bridge.js

@@ -367,12 +367,6 @@ var nativeBridge = (function (exports) {
                 }
             };
             const platform = getPlatformId(win);
-            if (platform == 'android' && typeof win.CapacitorSystemBarsAndroidInterface !== 'undefined') {
-                // add DOM ready listener for System Bars
-                document.addEventListener('DOMContentLoaded', function () {
-                    win.CapacitorSystemBarsAndroidInterface.onDOMReady();
-                });
-            }
             if (platform == 'android' || platform == 'ios') {
                 // patch document.cookie on Android/iOS
                 win.CapacitorCookiesDescriptor =

package/{CapacitorCordova/CapacitorCordova/Classes/Public → Sources/CapacitorCordova}/Plugin.swift

@@ -1,4 +1,9 @@
 import Capacitor
+// Under CocoaPods this file is compiled into the Cordova module itself, so importing it would be a
+// self-import. Under SPM the Swift and Objective-C halves are separate targets.
+#if SWIFT_PACKAGE
+import Cordova
+#endif
 
 @objc(CordovaPlugin)
 public class CordovaPlugin: CAPPlugin, CAPBridgedPlugin {

package/{Capacitor/Capacitor → Sources/CapacitorObjC}/CAPInstanceConfiguration.m

@@ -1,5 +1,13 @@
 #import "CAPInstanceConfiguration.h"
-#import <Capacitor/Capacitor-Swift.h>
+#import "CAPInstanceDescriptor.h"
+
+// Implemented in Swift (CAPInstanceDescriptor.swift), which can't be imported here without a
+// circular dependency. Declared locally rather than in the header so Swift doesn't see a
+// redeclaration.
+@interface CAPInstanceDescriptor (SwiftVended)
+@property (nonatomic, readonly) BOOL cordovaDeployDisabled;
+- (void)normalize;
+@end
 
 @interface CAPInstanceConfiguration (Internal)
 - (instancetype)initWithConfiguration:(CAPInstanceConfiguration*)configuration andLocation:(NSURL*)location;

package/{Capacitor/Capacitor → Sources/CapacitorObjC}/CAPInstanceDescriptor.m

@@ -1,5 +1,4 @@
 #import "CAPInstanceDescriptor.h"
-#import <Capacitor/Capacitor-Swift.h>
 
 // Swift extensions marked as @objc and internal are available to the Obj-C runtime but are not available at compile time.
 // so we need this declaration to avoid compiler complaints

package/Sources/CapacitorObjC/CAPPlugin.m

@@ -0,0 +1,100 @@
+#import "CAPPlugin.h"
+#import "CAPPluginCall.h"
+#import <Foundation/Foundation.h>
+
+// Implemented in Swift (CAPPlugin+Bridge.swift), which can't be imported here without a circular
+// dependency. Declared locally rather than in the header so Swift doesn't see a redeclaration.
+@interface CAPPlugin (SwiftVended)
+- (void)notifyListeners:(NSString* _Nonnull)eventName data:(NSDictionary<NSString *, id>* _Nullable)data;
+@end
+
+@implementation CAPPlugin
+
+- (instancetype)init {
+  if ((self = [super init])) {
+    _pluginId = @"";
+    _pluginName = @"";
+    _eventListeners = [[NSMutableDictionary alloc] init];
+    _retainedEventArguments = [[NSMutableDictionary alloc] init];
+    _shouldStringifyDatesInCalls = YES;
+  }
+  return self;
+}
+
+-(NSString *) getId {
+  return self.pluginName;
+}
+
+-(void)load {}
+
+- (void)addEventListener:(NSString *)eventName listener:(CAPPluginCall *)listener {
+  NSMutableArray *listenersForEvent = [self.eventListeners objectForKey:eventName];
+  if(listenersForEvent == nil || [listenersForEvent count] == 0) {
+    listenersForEvent = [[NSMutableArray alloc] initWithObjects:listener, nil];
+    [self.eventListeners setValue:listenersForEvent forKey:eventName];
+
+    [self sendRetainedArgumentsForEvent:eventName];
+  } else {
+    [listenersForEvent addObject:listener];
+  }
+}
+
+- (void)sendRetainedArgumentsForEvent:(NSString *)eventName {
+    // copy retained args and null source to prevent potential race conditions
+    NSMutableArray *retained = [self.retainedEventArguments objectForKey:eventName];
+    if (retained == nil) {
+        return;
+    }
+
+    [self.retainedEventArguments removeObjectForKey:eventName];
+
+    for(id data in retained) {
+        [self notifyListeners:eventName data:data];
+    }
+}
+
+- (void)removeEventListener:(NSString *)eventName listener:(CAPPluginCall *)listener {
+  NSMutableArray *listenersForEvent = [self.eventListeners objectForKey:eventName];
+  if(!listenersForEvent) { return; }
+  NSUInteger listenerIndex = [listenersForEvent indexOfObject:listener];
+  if(listenerIndex == NSNotFound) {
+    return;
+  }
+  [listenersForEvent removeObjectAtIndex:listenerIndex];
+}
+
+- (void)addListener:(CAPPluginCall *)call {
+  NSString *eventName = [call.options objectForKey:@"eventName"];
+  [call setKeepAlive:TRUE];
+  [self addEventListener:eventName listener:call];
+}
+
+- (NSArray<CAPPluginCall *>*)getListeners:(NSString *)eventName {
+  NSArray<CAPPluginCall *>* listeners = [self.eventListeners objectForKey:eventName];
+  return listeners;
+}
+
+- (BOOL)hasListeners:(NSString *)eventName {
+  NSArray<CAPPluginCall *>* listeners = [self.eventListeners objectForKey:eventName];
+
+  if (listeners == nil) {
+    return false;
+  }
+  return [listeners count] > 0;
+}
+
+-(BOOL)supportsPopover {
+    return YES;
+}
+
+- (NSNumber*)shouldOverrideLoad:(WKNavigationAction*)navigationAction {
+    return nil;
+}
+
+- (BOOL)handleWKWebViewURLAuthenticationChallenge:(NSURLAuthenticationChallenge* _Nonnull)challenge completionHandler:(void (^_Nonnull)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler {
+    return NO;
+}
+
+
+@end
+