fix #2288

README.md

@@ -46,8 +46,8 @@ Send a submission request to the [Submit App](https://inappwebview.dev/submit-ap
 - Dart sdk: "^3.5.0"
 - Flutter: ">=3.24.0"
 - Android: `minSdkVersion >= 19`, `compileSdk >= 34`, [AGP](https://developer.android.com/build/releases/gradle-plugin) version `>= 7.3.0` (use [Android Studio - Android Gradle plugin Upgrade Assistant](https://developer.android.com/build/agp-upgrade-assistant) for help), support for `androidx` (see [AndroidX Migration](https://flutter.dev/docs/development/androidx-migration) to migrate an existing app)
-- iOS 12.0+: `--ios-language swift`, Xcode version `>= 16.0`
-- MacOS 10.14+: Xcode version `>= 16.0`
+- iOS 12.0+: `--ios-language swift`, Xcode version `>= 15.0`
+- MacOS 10.14+: Xcode version `>= 15.0`
 
 ## Installation
 

flutter_inappwebview/README.md

@@ -46,8 +46,8 @@ Send a submission request to the [Submit App](https://inappwebview.dev/submit-ap
 - Dart sdk: "^3.5.0"
 - Flutter: ">=3.24.0"
 - Android: `minSdkVersion >= 19`, `compileSdk >= 34`, [AGP](https://developer.android.com/build/releases/gradle-plugin) version `>= 7.3.0` (use [Android Studio - Android Gradle plugin Upgrade Assistant](https://developer.android.com/build/agp-upgrade-assistant) for help), support for `androidx` (see [AndroidX Migration](https://flutter.dev/docs/development/androidx-migration) to migrate an existing app)
-- iOS 12.0+: `--ios-language swift`, Xcode version `>= 16.0`
-- MacOS 10.14+: Xcode version `>= 16.0`
+- iOS 12.0+: `--ios-language swift`, Xcode version `>= 15.0`
+- MacOS 10.14+: Xcode version `>= 15.0`
 
 ## Installation
 

flutter_inappwebview_ios/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0+1 
+
+- Fixed "v6.1.0 fails to compile on Xcode 15" [#2288](https://github.com/pichillilorenzo/flutter_inappwebview/issues/2288)
+
 ## 1.1.0
 
 - Fixed XCode 16 build

flutter_inappwebview_ios/ios/Classes/InAppWebView/InAppWebView.swift

@@ -1429,6 +1429,7 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
         }
     }
 
+#if compiler(>=6.0)
     public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: (@MainActor @Sendable (Any?, (any Error)?) -> Void)? = nil) {
         if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {
             if let completionHandler = completionHandler {
@@ -1438,6 +1439,17 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
         }
         super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)
     }
+#else
+    public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {
+        if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {
+            if let completionHandler = completionHandler {
+                completionHandler(nil, nil)
+            }
+            return
+        }
+        super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)
+    }
+#endif
 
     @available(iOS 14.0, *)
     public func evaluateJavaScript(_ javaScript: String, frame: WKFrameInfo? = nil, contentWorld: WKContentWorld, completionHandler: ((Result<Any, Error>) -> Void)? = nil) {

flutter_inappwebview_ios/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview_ios
 description: iOS implementation of the flutter_inappwebview plugin.
-version: 1.1.0
+version: 1.1.0+1
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_ios
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues

flutter_inappwebview_macos/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0+1
+
+- Fixed "v6.1.0 fails to compile on Xcode 15" [#2288](https://github.com/pichillilorenzo/flutter_inappwebview/issues/2288)
+
 ## 1.1.0
 
 - Added `InAppWebView` support

flutter_inappwebview_macos/macos/Classes/InAppWebView/InAppWebView.swift

@@ -867,6 +867,7 @@ public class InAppWebView: WKWebView, WKUIDelegate,
         }
     }
 
+#if compiler(>=6.0)
     public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: (@MainActor @Sendable (Any?, (any Error)?) -> Void)? = nil) {
         if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {
             if let completionHandler = completionHandler {
@@ -876,6 +877,17 @@ public class InAppWebView: WKWebView, WKUIDelegate,
         }
         super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)
     }
+#else
+    public override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {
+        if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {
+            if let completionHandler = completionHandler {
+                completionHandler(nil, nil)
+            }
+            return
+        }
+        super.evaluateJavaScript(javaScriptString, completionHandler: completionHandler)
+    }
+#endif
 
     @available(macOS 11.0, *)
     public func evaluateJavaScript(_ javaScript: String, frame: WKFrameInfo? = nil, contentWorld: WKContentWorld, completionHandler: ((Result<Any, Error>) -> Void)? = nil) {

flutter_inappwebview_macos/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview_macos
 description: macOS implementation of the flutter_inappwebview plugin.
-version: 1.1.0
+version: 1.1.0+1
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_macos
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues