fix: support xcode16+ios18

lanistor · lanistor · commit c8eb3abfbb1c · 2024-09-28T22:31:33.000+08:00
diff --git a/ios/Classes/InAppWebView/InAppWebView.swift b/ios/Classes/InAppWebView/InAppWebView.swift
@@ -1416,11 +1416,9 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
         }
     }
     
-    public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {
+    public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: (@MainActor @Sendable (Any?, (any Error)?) -> Void)? = nil) {
         if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {
-            if let completionHandler = completionHandler {
-                completionHandler(nil, nil)
-            }
+            completionHandler(nil, nil)
             return
         }
         super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)
diff --git a/macos/Classes/InAppWebView/InAppWebView.swift b/macos/Classes/InAppWebView/InAppWebView.swift
@@ -841,11 +841,9 @@ public class InAppWebView: WKWebView, WKUIDelegate,
         }
     }
     
-    public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {
+    public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: (@MainActor @Sendable (Any?, (any Error)?) -> Void)? = nil) {
         if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {
-            if let completionHandler = completionHandler {
-                completionHandler(nil, nil)
-            }
+            completionHandler(nil, nil)
             return
         }
         super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)

Original file line number	Diff line number	Diff line change
`@@ -1416,11 +1416,9 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,`
`1416`	`1416`	`}`
`1417`	`1417`	`}`
`1418`	`1418`
`1419`		`- public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {`
	`1419`	`+ public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: (@MainActor @Sendable (Any?, (any Error)?) -> Void)? = nil) {`
`1420`	`1420`	`if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {`
`1421`		`- if let completionHandler = completionHandler {`
`1422`		`- completionHandler(nil, nil)`
`1423`		`- }`
	`1421`	`+ completionHandler(nil, nil)`
`1424`	`1422`	`return`
`1425`	`1423`	`}`
`1426`	`1424`	`super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)`
Original file line number	Diff line number	Diff line change
`@@ -841,11 +841,9 @@ public class InAppWebView: WKWebView, WKUIDelegate,`
`841`	`841`	`}`
`842`	`842`	`}`
`843`	`843`
`844`		`- public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {`
	`844`	`+ public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: (@MainActor @Sendable (Any?, (any Error)?) -> Void)? = nil) {`
`845`	`845`	`if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {`
`846`		`- if let completionHandler = completionHandler {`
`847`		`- completionHandler(nil, nil)`
`848`		`- }`
	`846`	`+ completionHandler(nil, nil)`
`849`	`847`	`return`
`850`	`848`	`}`
`851`	`849`	`super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)`