[webview_flutter]Add missing template type parameter to `invokeMethod` calls. Bump minimum Flutter version to 1.5.0. Replace invokeMethod with invokeMapMethod wherever necessary.
diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index 4ba6202..4d6e076 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.3.9+1
+
+* Add missing template type parameter to `invokeMethod` calls.
+* Bump minimum Flutter version to 1.5.0.
+* Replace invokeMethod with invokeMapMethod wherever necessary.
+
## 0.3.9
* Allow external packages to provide webview implementations for new platforms.
diff --git a/packages/webview_flutter/lib/src/webview_method_channel.dart b/packages/webview_flutter/lib/src/webview_method_channel.dart
index 91cb3b6..ce99887 100644
--- a/packages/webview_flutter/lib/src/webview_method_channel.dart
+++ b/packages/webview_flutter/lib/src/webview_method_channel.dart
@@ -49,72 +49,64 @@
Map<String, String> headers,
) async {
assert(url != null);
- // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
- // https://github.com/flutter/flutter/issues/26431
- // ignore: strong_mode_implicit_dynamic_method
- return _channel.invokeMethod('loadUrl', <String, dynamic>{
+ return _channel.invokeMethod<void>('loadUrl', <String, dynamic>{
'url': url,
'headers': headers,
});
}
@override
- Future<String> currentUrl() => _channel.invokeMethod('currentUrl');
+ Future<String> currentUrl() => _channel.invokeMethod<String>('currentUrl');
@override
- Future<bool> canGoBack() => _channel.invokeMethod("canGoBack");
+ Future<bool> canGoBack() => _channel.invokeMethod<bool>("canGoBack");
@override
- Future<bool> canGoForward() => _channel.invokeMethod("canGoForward");
+ Future<bool> canGoForward() => _channel.invokeMethod<bool>("canGoForward");
@override
- Future<void> goBack() => _channel.invokeMethod("goBack");
+ Future<void> goBack() => _channel.invokeMethod<void>("goBack");
@override
- Future<void> goForward() => _channel.invokeMethod("goForward");
+ Future<void> goForward() => _channel.invokeMethod<void>("goForward");
@override
- Future<void> reload() => _channel.invokeMethod("reload");
+ Future<void> reload() => _channel.invokeMethod<void>("reload");
@override
- Future<void> clearCache() => _channel.invokeMethod("clearCache");
+ Future<void> clearCache() => _channel.invokeMethod<void>("clearCache");
@override
Future<void> updateSettings(WebSettings settings) {
- // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter.
- // https://github.com/flutter/flutter/issues/26431
- // ignore: strong_mode_implicit_dynamic_method
final Map<String, dynamic> updatesMap = _webSettingsToMap(settings);
if (updatesMap.isEmpty) {
return null;
}
- return _channel.invokeMethod('updateSettings', updatesMap);
+ return _channel.invokeMethod<void>('updateSettings', updatesMap);
}
@override
Future<String> evaluateJavascript(String javascriptString) {
- return _channel.invokeMethod('evaluateJavascript', javascriptString);
+ return _channel.invokeMethod<String>(
+ 'evaluateJavascript', javascriptString);
}
@override
Future<void> addJavascriptChannels(Set<String> javascriptChannelNames) {
- return _channel.invokeMethod(
+ return _channel.invokeMethod<void>(
'addJavascriptChannels', javascriptChannelNames.toList());
}
@override
Future<void> removeJavascriptChannels(Set<String> javascriptChannelNames) {
- return _channel.invokeMethod(
+ return _channel.invokeMethod<void>(
'removeJavascriptChannels', javascriptChannelNames.toList());
}
/// Method channel mplementation for [WebViewPlatform.clearCookies].
static Future<bool> clearCookies() {
return _cookieManagerChannel
- // TODO(amirh): remove this when the invokeMethod update makes it to stable Flutter.
- // https://github.com/flutter/flutter/issues/26431
- // ignore: strong_mode_implicit_dynamic_method
- .invokeMethod('clearCookies')
+ .invokeMethod<bool>('clearCookies')
.then<bool>((dynamic result) => result);
}
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 2dbabc8..b1658f3 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,12 +1,12 @@
name: webview_flutter
description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.9
+version: 0.3.9+1
author: Flutter Team <flutter-dev@googlegroups.com>
homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
environment:
sdk: ">=2.0.0-dev.68.0 <3.0.0"
- flutter: ">=0.11.9 <2.0.0"
+ flutter: ">=1.5.0 <2.0.0"
dependencies:
flutter:
