@capacitor/ios 8.0.0-alpha.2 → 8.0.0-alpha.3

package/Capacitor/Capacitor/WKWebView+Capacitor.swift

@@ -62,7 +62,6 @@ internal extension WKWebView {
             method_setImplementation(method, imp)
         }
 
-        // iOS 13+
         let selectorMkIV: Selector = sel_getUid("_elementDidFocus:userIsInteracting:blurPreviousNode:activityStateChanges:userObject:")
 
         if let method = class_getInstanceMethod(targetClass, selectorMkIV) {

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -1,5 +1,5 @@
 import Foundation
-import MobileCoreServices
+import UniformTypeIdentifiers
 
 @objc(CAPWebViewAssetHandler)
 // swiftlint:disable type_body_length
@@ -106,12 +106,12 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
 
     open func mimeTypeForExtension(pathExtension: String) -> String {
         if !pathExtension.isEmpty {
-            if let uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, pathExtension as NSString, nil)?.takeRetainedValue() {
-                if let mimetype = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType)?.takeRetainedValue() {
-                    return mimetype as String
+            if let uti = UTType(filenameExtension: pathExtension) {
+                if let mimetype = uti.preferredMIMEType {
+                    return mimetype
                 }
             }
-            // TODO: Remove in the future if Apple fixes the issue
+            // TODO: Remove when deployment target is set to iOS 17
             if let mimeType = mimeTypes[pathExtension] {
                 return mimeType
             }

package/Capacitor/Capacitor/WebViewDelegationHandler.swift

@@ -47,7 +47,6 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
         bridge?.reset()
     }
 
-    @available(iOS 15, *)
     open func webView(
         _ webView: WKWebView,
         requestMediaCapturePermissionFor origin: WKSecurityOrigin,
@@ -58,7 +57,6 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
         decisionHandler(.grant)
     }
 
-    @available(iOS 15, *)
     open func webView(_ webView: WKWebView,
                       requestDeviceOrientationAndMotionPermissionFor origin: WKSecurityOrigin,
                       initiatedByFrame frame: WKFrameInfo,
@@ -159,6 +157,7 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
 
     open func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
         CAPLog.print("⚡️  WebView process terminated")
+        bridge?.reset()
         webView.reload()
     }
 

package/CapacitorCordova/CapacitorCordova/CapacitorCordova.h

@@ -9,6 +9,7 @@ FOUNDATION_EXPORT const unsigned char CapacitorCordovaVersionString[];
 #import <Cordova/AppDelegate.h>
 #import <Cordova/CDV.h>
 #import <Cordova/CDVAvailability.h>
+#import <Cordova/CDVAvailabilityDeprecated.h>
 #import <Cordova/CDVCommandDelegate.h>
 #import <Cordova/CDVCommandDelegateImpl.h>
 #import <Cordova/CDVConfigParser.h>

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVAvailabilityDeprecated.h

@@ -0,0 +1,21 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ */
+
+#define CDV_DEPRECATED(version, msg) __attribute__((deprecated("Deprecated in Cordova " #version ". " msg)))
+#define CDV_DEPRECATED_WITH_REPLACEMENT(version, msg, repl) __attribute__((deprecated("Deprecated in Cordova " #version ". " msg, repl)))

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPlugin.h

@@ -24,12 +24,6 @@
 #import "CDVAvailability.h"
 #import <WebKit/WebKit.h>
 
-@interface UIView (org_apache_cordova_UIView_Extension)
-
-@property (nonatomic, weak) UIScrollView* scrollView;
-
-@end
-
 extern NSString* const CDVPageDidLoadNotification;
 extern NSString* const CDVPluginHandleOpenURLNotification;
 extern NSString* const CDVPluginHandleOpenURLWithAppSourceAndAnnotationNotification;
@@ -54,7 +48,7 @@ extern NSString* const CDVViewWillTransitionToSizeNotification;
 @interface CDVPlugin : NSObject {}
 
 - (instancetype)initWithWebViewEngine:(WKWebView *)theWebViewEngine;
-@property (nonatomic, weak) UIView* webView;
+@property (nonatomic, weak) WKWebView* webView;
 @property (nonatomic, weak) WKWebView * webViewEngine;
 @property (nonatomic, strong) NSString * className;
 

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPlugin.m

@@ -18,24 +18,6 @@
  */
 
 #import "CDVPlugin.h"
-#include <objc/message.h>
-
-@implementation UIView (org_apache_cordova_UIView_Extension)
-
-@dynamic scrollView;
-
-- (UIScrollView*)scrollView
-{
-    SEL scrollViewSelector = NSSelectorFromString(@"scrollView");
-
-    if ([self respondsToSelector:scrollViewSelector]) {
-        return ((id (*)(id, SEL))objc_msgSend)(self, scrollViewSelector);
-    }
-
-    return nil;
-}
-
-@end
 
 NSString* const CDVPageDidLoadNotification = @"CDVPageDidLoadNotification";
 NSString* const CDVPluginHandleOpenURLNotification = @"CDVPluginHandleOpenURLNotification";

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVWebViewProcessPoolFactory.h

@@ -18,7 +18,14 @@
  */
 
 #import <WebKit/WebKit.h>
+#import <Cordova/CDVAvailabilityDeprecated.h>
 
+/**
+ @Metadata {
+    @Available(Cordova, introduced: "6.2.0", deprecated: "8.0.0")
+ }
+ */
+CDV_DEPRECATED(8.0.0, "WebKit WKProcessPool is deprecated in iOS")
 @interface CDVWebViewProcessPoolFactory : NSObject
 @property (nonatomic, retain) WKProcessPool* sharedPool;
 

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVWebViewProcessPoolFactory.m

@@ -21,6 +21,10 @@
 @import WebKit;
 #import <Cordova/CDVWebViewProcessPoolFactory.h>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
+
 static CDVWebViewProcessPoolFactory *factory = nil;
 
 @implementation CDVWebViewProcessPoolFactory
@@ -47,3 +51,5 @@ static CDVWebViewProcessPoolFactory *factory = nil;
     return _sharedPool;
 }
 @end
+
+#pragma clang diagnostic pop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "8.0.0-alpha.2",
+  "version": "8.0.0-alpha.3",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -21,11 +21,11 @@
   ],
   "scripts": {
     "verify": "npm run xc:build:Capacitor && npm run xc:build:CapacitorCordova",
-    "xc:build:Capacitor": "cd Capacitor && xcodebuild clean test -workspace Capacitor.xcworkspace -scheme Capacitor -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' && cd ..",
+    "xc:build:Capacitor": "cd Capacitor && xcodebuild clean test -workspace Capacitor.xcworkspace -scheme Capacitor -destination 'platform=iOS Simulator,name=iPhone 16,OS=26.0' && cd ..",
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^8.0.0-alpha.2"
+    "@capacitor/core": "^8.0.0-alpha.3"
   },
   "publishConfig": {
     "access": "public"