Skip to content

Commit a7aa783

Browse files
bparrishMinesmauricioluz
authored andcommitted
[webview_flutter_wkwebview] Raise minimum Dart and Flutter version to 2.17 and 3.0.0, respectively. (flutter#5850)
1 parent 3b36add commit a7aa783

File tree

7 files changed

+38
-55
lines changed

7 files changed

+38
-55
lines changed

packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.8.0
2+
3+
* Raises minimum Dart version to 2.17 and Flutter version to 3.0.0.
4+
15
## 2.7.5
26

37
* Minor fixes for new analysis options.

packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation_api_impls.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,9 @@ class FoundationFlutterApis {
8989
class NSObjectHostApiImpl extends NSObjectHostApi {
9090
/// Constructs an [NSObjectHostApiImpl].
9191
NSObjectHostApiImpl({
92-
BinaryMessenger? binaryMessenger,
92+
super.binaryMessenger,
9393
InstanceManager? instanceManager,
94-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
95-
super(binaryMessenger: binaryMessenger);
94+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
9695

9796
/// Maintains instances stored to communicate with Objective-C objects.
9897
final InstanceManager instanceManager;

packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart

+4-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66
import 'dart:math';
77

88
import 'package:flutter/painting.dart' show Color;
9-
import 'package:flutter/services.dart';
109

1110
import '../common/instance_manager.dart';
1211
import '../common/web_kit.pigeon.dart';
@@ -17,10 +16,9 @@ import 'ui_kit.dart';
1716
class UIScrollViewHostApiImpl extends UIScrollViewHostApi {
1817
/// Constructs a [UIScrollViewHostApiImpl].
1918
UIScrollViewHostApiImpl({
20-
BinaryMessenger? binaryMessenger,
19+
super.binaryMessenger,
2120
InstanceManager? instanceManager,
22-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
23-
super(binaryMessenger: binaryMessenger);
21+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
2422

2523
/// Maintains instances stored to communicate with Objective-C objects.
2624
final InstanceManager instanceManager;
@@ -75,10 +73,9 @@ class UIScrollViewHostApiImpl extends UIScrollViewHostApi {
7573
class UIViewHostApiImpl extends UIViewHostApi {
7674
/// Constructs a [UIViewHostApiImpl].
7775
UIViewHostApiImpl({
78-
BinaryMessenger? binaryMessenger,
76+
super.binaryMessenger,
7977
InstanceManager? instanceManager,
80-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
81-
super(binaryMessenger: binaryMessenger);
78+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
8279

8380
/// Maintains instances stored to communicate with Objective-C objects.
8481
final InstanceManager instanceManager;

packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit.dart

+5-13
Original file line numberDiff line numberDiff line change
@@ -600,13 +600,9 @@ class WKUIDelegate {
600600
class WKNavigationDelegate extends NSObject {
601601
/// Constructs a [WKNavigationDelegate].
602602
WKNavigationDelegate({
603-
BinaryMessenger? binaryMessenger,
604-
InstanceManager? instanceManager,
605-
}) : _navigationDelegateApi = WKNavigationDelegateHostApiImpl(
606-
binaryMessenger: binaryMessenger,
607-
instanceManager: instanceManager,
608-
),
609-
super(
603+
super.binaryMessenger,
604+
super.instanceManager,
605+
}) : _navigationDelegateApi = WKNavigationDelegateHostApiImpl(
610606
binaryMessenger: binaryMessenger,
611607
instanceManager: instanceManager,
612608
) {
@@ -682,17 +678,13 @@ class WKWebView extends UIView {
682678
/// configuration object.
683679
WKWebView(
684680
WKWebViewConfiguration configuration, {
685-
BinaryMessenger? binaryMessenger,
686-
InstanceManager? instanceManager,
681+
super.binaryMessenger,
682+
super.instanceManager,
687683
}) : _binaryMessenger = binaryMessenger,
688684
_instanceManager = instanceManager,
689685
_webViewApi = WKWebViewHostApiImpl(
690686
binaryMessenger: binaryMessenger,
691687
instanceManager: instanceManager,
692-
),
693-
super(
694-
binaryMessenger: binaryMessenger,
695-
instanceManager: instanceManager,
696688
) {
697689
_webViewApi.createForInstances(this, configuration);
698690
}

packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart

+18-27
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,9 @@ class WebKitFlutterApis {
224224
class WKWebsiteDataStoreHostApiImpl extends WKWebsiteDataStoreHostApi {
225225
/// Constructs a [WebsiteDataStoreHostApiImpl].
226226
WKWebsiteDataStoreHostApiImpl({
227-
BinaryMessenger? binaryMessenger,
227+
super.binaryMessenger,
228228
InstanceManager? instanceManager,
229-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
230-
super(binaryMessenger: binaryMessenger);
229+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
231230

232231
/// Maintains instances stored to communicate with Objective-C objects.
233232
final InstanceManager instanceManager;
@@ -269,10 +268,9 @@ class WKWebsiteDataStoreHostApiImpl extends WKWebsiteDataStoreHostApi {
269268
class WKScriptMessageHandlerHostApiImpl extends WKScriptMessageHandlerHostApi {
270269
/// Constructs a [WKScriptMessageHandlerHostApiImpl].
271270
WKScriptMessageHandlerHostApiImpl({
272-
BinaryMessenger? binaryMessenger,
271+
super.binaryMessenger,
273272
InstanceManager? instanceManager,
274-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
275-
super(binaryMessenger: binaryMessenger);
273+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
276274

277275
/// Maintains instances stored to communicate with Objective-C objects.
278276
final InstanceManager instanceManager;
@@ -287,10 +285,9 @@ class WKScriptMessageHandlerHostApiImpl extends WKScriptMessageHandlerHostApi {
287285
class WKPreferencesHostApiImpl extends WKPreferencesHostApi {
288286
/// Constructs a [WKPreferencesHostApiImpl].
289287
WKPreferencesHostApiImpl({
290-
BinaryMessenger? binaryMessenger,
288+
super.binaryMessenger,
291289
InstanceManager? instanceManager,
292-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
293-
super(binaryMessenger: binaryMessenger);
290+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
294291

295292
/// Maintains instances stored to communicate with Objective-C objects.
296293
final InstanceManager instanceManager;
@@ -322,10 +319,9 @@ class WKPreferencesHostApiImpl extends WKPreferencesHostApi {
322319
class WKHttpCookieStoreHostApiImpl extends WKHttpCookieStoreHostApi {
323320
/// Constructs a [WKHttpCookieStoreHostApiImpl].
324321
WKHttpCookieStoreHostApiImpl({
325-
BinaryMessenger? binaryMessenger,
322+
super.binaryMessenger,
326323
InstanceManager? instanceManager,
327-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
328-
super(binaryMessenger: binaryMessenger);
324+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
329325

330326
/// Maintains instances stored to communicate with Objective-C objects.
331327
final InstanceManager instanceManager;
@@ -358,10 +354,9 @@ class WKUserContentControllerHostApiImpl
358354
extends WKUserContentControllerHostApi {
359355
/// Constructs a [WKUserContentControllerHostApiImpl].
360356
WKUserContentControllerHostApiImpl({
361-
BinaryMessenger? binaryMessenger,
357+
super.binaryMessenger,
362358
InstanceManager? instanceManager,
363-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
364-
super(binaryMessenger: binaryMessenger);
359+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
365360

366361
/// Maintains instances stored to communicate with Objective-C objects.
367362
final InstanceManager instanceManager;
@@ -433,10 +428,9 @@ class WKUserContentControllerHostApiImpl
433428
class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi {
434429
/// Constructs a [WKWebViewConfigurationHostApiImpl].
435430
WKWebViewConfigurationHostApiImpl({
436-
BinaryMessenger? binaryMessenger,
431+
super.binaryMessenger,
437432
InstanceManager? instanceManager,
438-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
439-
super(binaryMessenger: binaryMessenger);
433+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
440434

441435
/// Maintains instances stored to communicate with Objective-C objects.
442436
final InstanceManager instanceManager;
@@ -484,10 +478,9 @@ class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi {
484478
class WKUIDelegateHostApiImpl extends WKUIDelegateHostApi {
485479
/// Constructs a [WKUIDelegateHostApiImpl].
486480
WKUIDelegateHostApiImpl({
487-
BinaryMessenger? binaryMessenger,
481+
super.binaryMessenger,
488482
InstanceManager? instanceManager,
489-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
490-
super(binaryMessenger: binaryMessenger);
483+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
491484

492485
/// Maintains instances stored to communicate with Objective-C objects.
493486
final InstanceManager instanceManager;
@@ -502,10 +495,9 @@ class WKUIDelegateHostApiImpl extends WKUIDelegateHostApi {
502495
class WKNavigationDelegateHostApiImpl extends WKNavigationDelegateHostApi {
503496
/// Constructs a [WKNavigationDelegateHostApiImpl].
504497
WKNavigationDelegateHostApiImpl({
505-
BinaryMessenger? binaryMessenger,
498+
super.binaryMessenger,
506499
InstanceManager? instanceManager,
507-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
508-
super(binaryMessenger: binaryMessenger);
500+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
509501

510502
/// Maintains instances stored to communicate with Objective-C objects.
511503
final InstanceManager instanceManager;
@@ -561,10 +553,9 @@ class WKNavigationDelegateFlutterApiImpl
561553
class WKWebViewHostApiImpl extends WKWebViewHostApi {
562554
/// Constructs a [WKWebViewHostApiImpl].
563555
WKWebViewHostApiImpl({
564-
BinaryMessenger? binaryMessenger,
556+
super.binaryMessenger,
565557
InstanceManager? instanceManager,
566-
}) : instanceManager = instanceManager ?? InstanceManager.instance,
567-
super(binaryMessenger: binaryMessenger);
558+
}) : instanceManager = instanceManager ?? InstanceManager.instance;
568559

569560
/// Maintains instances stored to communicate with Objective-C objects.
570561
final InstanceManager instanceManager;

packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit_webview_widget.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import 'web_kit/web_kit.dart';
1818
class WebKitWebViewWidget extends StatefulWidget {
1919
/// Constructs a [WebKitWebViewWidget].
2020
const WebKitWebViewWidget({
21-
Key? key,
21+
super.key,
2222
required this.creationParams,
2323
required this.callbacksHandler,
2424
required this.javascriptChannelRegistry,
2525
required this.onBuildWidget,
2626
this.configuration,
2727
@visibleForTesting this.webViewProxy = const WebViewWidgetProxy(),
28-
}) : super(key: key);
28+
});
2929

3030
/// The initial parameters used to setup the WebView.
3131
final CreationParams creationParams;

packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: webview_flutter_wkwebview
22
description: A Flutter plugin that provides a WebView widget based on Apple's WKWebView control.
33
repository: https://github.com/flutter/plugins/tree/main/packages/webview_flutter/webview_flutter_wkwebview
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
5-
version: 2.7.5
5+
version: 2.8.0
66

77
environment:
8-
sdk: ">=2.14.0 <3.0.0"
9-
flutter: ">=2.8.0"
8+
sdk: ">=2.17.0 <3.0.0"
9+
flutter: ">=3.0.0"
1010

1111
flutter:
1212
plugin:

0 commit comments

Comments
 (0)