From 3b318b28042a0e15ee448083b7aa8b7c1edaeee9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:25:50 +0000 Subject: [PATCH 1/3] [webview]: Bump webkit Bumps webkit from 1.0.0 to 1.5.0. --- updated-dependencies: - dependency-name: androidx.webkit:webkit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../webview_flutter_android/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index 7c55559cb832..6d6d2f12ea04 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -36,7 +36,7 @@ android { dependencies { implementation 'androidx.annotation:annotation:1.4.0' - implementation 'androidx.webkit:webkit:1.0.0' + implementation 'androidx.webkit:webkit:1.5.0' testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-inline:4.7.0' testImplementation 'androidx.test:core:1.3.0' From d9ebda8e461bf8747d90631ff9aa5ace8d6102a9 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 31 Aug 2022 14:40:44 -0400 Subject: [PATCH 2/3] compileSdkVersion --- .../webview_flutter/webview_flutter_android/CHANGELOG.md | 6 ++++++ .../webview_flutter_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../webview_flutter/webview_flutter_android/pubspec.yaml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md index 3d3731979866..4768f0144cc7 100644 --- a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md +++ b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.10.0 + +* Bumps webkit from 1.0.0 to 1.5.0. +* Raises minimum compileSdkVersion to 32. This requires setting the `compileSdkVersion` in the app + level `build.gradle` to a minimum of 32. + ## 2.9.5 * Adds dispose methods for HostApi and FlutterApi of JavaObject. diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index 6d6d2f12ea04..8fd52e396da2 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -22,7 +22,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { minSdkVersion 19 diff --git a/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle b/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle index b75bc9df5ebb..0c55b4d594be 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 + compileSdkVersion 32 lintOptions { disable 'InvalidPackage' diff --git a/packages/webview_flutter/webview_flutter_android/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/pubspec.yaml index bbff4fe7dce5..4c1f5766e712 100644 --- a/packages/webview_flutter/webview_flutter_android/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: webview_flutter_android description: A Flutter plugin that provides a WebView widget on Android. repository: https://github.com/flutter/plugins/tree/main/packages/webview_flutter/webview_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22 -version: 2.9.5 +version: 2.10.0 environment: sdk: ">=2.14.0 <3.0.0" From e1bb1856d5797b30e73b505651edd536b0e3b171 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 31 Aug 2022 18:21:03 -0400 Subject: [PATCH 3/3] update tool and CHANGELOG --- packages/webview_flutter/webview_flutter_android/CHANGELOG.md | 3 +-- script/tool/CHANGELOG.md | 4 ++++ script/tool/lib/src/create_all_plugins_app_command.dart | 4 ++-- script/tool/pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md index 4768f0144cc7..0eb1aac530df 100644 --- a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md +++ b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md @@ -1,8 +1,7 @@ ## 2.10.0 * Bumps webkit from 1.0.0 to 1.5.0. -* Raises minimum compileSdkVersion to 32. This requires setting the `compileSdkVersion` in the app - level `build.gradle` to a minimum of 32. +* Raises minimum `compileSdkVersion` to 32. ## 2.9.5 diff --git a/script/tool/CHANGELOG.md b/script/tool/CHANGELOG.md index 595943777c68..ebfbe80b0184 100644 --- a/script/tool/CHANGELOG.md +++ b/script/tool/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.3 + +* Raises minimum `compileSdkVersion` to 32 for the `all-plugins-app` command. + ## 0.9.2 * Adds checking of `code-excerpt` configuration to `readme-check`, to validate diff --git a/script/tool/lib/src/create_all_plugins_app_command.dart b/script/tool/lib/src/create_all_plugins_app_command.dart index 595779b8be68..7bf007ac72a5 100644 --- a/script/tool/lib/src/create_all_plugins_app_command.dart +++ b/script/tool/lib/src/create_all_plugins_app_command.dart @@ -101,8 +101,8 @@ class CreateAllPluginsAppCommand extends PluginCommand { // minSdkVersion 19 is required by WebView. newGradle.writeln('minSdkVersion 20'); } else if (line.contains('compileSdkVersion')) { - // compileSdkVersion 31 is required by Camera. - newGradle.writeln('compileSdkVersion 31'); + // compileSdkVersion 32 is required by webview_flutter. + newGradle.writeln('compileSdkVersion 32'); } else { newGradle.writeln(line); } diff --git a/script/tool/pubspec.yaml b/script/tool/pubspec.yaml index 3c25ef62b205..b1d55e0fe550 100644 --- a/script/tool/pubspec.yaml +++ b/script/tool/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_plugin_tools description: Productivity utils for flutter/plugins and flutter/packages repository: https://github.com/flutter/plugins/tree/main/script/tool -version: 0.9.2 +version: 0.9.3 dependencies: args: ^2.1.0