Merge branch 'master' of https://github.com/pichillilorenzo/flutter_i…

…nappwebview
pichillilorenzo · Oct 1, 2024 · 1834bed · 1834bed
2 parents 3901f96 + fb88d0f
commit 1834bed
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 72 deletions.
diff --git a/flutter_inappwebview/CHANGELOG.md b/flutter_inappwebview/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 6.1.3
+
+- Updated dependencies to the latest versions for all platform implementations:
+  - `flutter_inappwebview_platform_interface`: `^1.1.0` -> `^1.2.0`
+  - `flutter_inappwebview_android`: `^1.1.0+4` -> `^1.1.1`
+  - `flutter_inappwebview_ios`: `^1.1.0+3` -> `^1.1.1`
+  - `flutter_inappwebview_macos`: `^1.1.0+3` -> `^1.1.1`
+  - `flutter_inappwebview_web`: `^1.1.0+2` -> `^1.1.1`
+  - `flutter_inappwebview_windows`: `^0.3.0` -> `^0.4.0`
+
+#### Windows Platform
+  - Updated `shouldOverrideUrlLoading` implementation using the Chrome DevTools Protocol API Fetch.requestPaused event
+
 ## 6.1.2
 
 - Updated minimum platform implementation versions

diff --git a/flutter_inappwebview/pubspec.yaml b/flutter_inappwebview/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_inappwebview
 description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window.
-version: 6.1.2
+version: 6.1.3
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -20,12 +20,12 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.1.1
-  flutter_inappwebview_android: ^1.1.0+4
-  flutter_inappwebview_ios: ^1.1.0+3
-  flutter_inappwebview_macos: ^1.1.0+3
-  flutter_inappwebview_web: ^1.1.0+2
-  flutter_inappwebview_windows: ^0.3.0
+  flutter_inappwebview_platform_interface: ^1.2.0
+  flutter_inappwebview_android: ^1.1.1
+  flutter_inappwebview_ios: ^1.1.1
+  flutter_inappwebview_macos: ^1.1.1
+  flutter_inappwebview_web: ^1.1.1
+  flutter_inappwebview_windows: ^0.4.0
 
 dev_dependencies:
   flutter_test:

diff --git a/flutter_inappwebview_android/CHANGELOG.md b/flutter_inappwebview_android/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.1.2
+
+- Removed webview/plugin_scripts_js/ConsoleLogJS.java file, use native WebChromeClient.onConsoleMessage instead
+
+## 1.1.1
+
+- Updated flutter_inappwebview_platform_interface version to ^1.2.0
+
 ## 1.1.0+4
 
 - Updated flutter_inappwebview_platform_interface version

diff --git a/...java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java b/...java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java
diff --git a/...com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java b/...com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java
@@ -71,7 +71,6 @@
 import com.pichillilorenzo.flutter_inappwebview_android.content_blocker.ContentBlockerTrigger;
 import com.pichillilorenzo.flutter_inappwebview_android.find_interaction.FindInteractionController;
 import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserDelegate;
-import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.ConsoleLogJS;
 import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.InterceptAjaxRequestJS;
 import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.InterceptFetchRequestJS;
 import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
@@ -563,7 +562,6 @@ public boolean onLongClick(View v) {
   public void prepareAndAddUserScripts() {
     userContentController.addPluginScript(PromisePolyfillJS.PROMISE_POLYFILL_JS_PLUGIN_SCRIPT);
     userContentController.addPluginScript(JavaScriptBridgeJS.JAVASCRIPT_BRIDGE_JS_PLUGIN_SCRIPT);
-    userContentController.addPluginScript(ConsoleLogJS.CONSOLE_LOG_JS_PLUGIN_SCRIPT);
     userContentController.addPluginScript(PrintJS.PRINT_JS_PLUGIN_SCRIPT);
     userContentController.addPluginScript(OnWindowBlurEventJS.ON_WINDOW_BLUR_EVENT_JS_PLUGIN_SCRIPT);
     userContentController.addPluginScript(OnWindowFocusEventJS.ON_WINDOW_FOCUS_EVENT_JS_PLUGIN_SCRIPT);

diff --git a/...lorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java b/...lorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java
@@ -739,7 +739,7 @@ public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
               consoleMessage.message(),
               consoleMessage.messageLevel().ordinal());
     }
-    return true;
+    return super.onConsoleMessage(consoleMessage);
   }
 
   @Override

diff --git a/flutter_inappwebview_android/pubspec.yaml b/flutter_inappwebview_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_inappwebview_android
 description: Android implementation of the flutter_inappwebview plugin.
-version: 1.1.0+4
+version: 1.1.2
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_android
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -20,7 +20,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.1.1
+  flutter_inappwebview_platform_interface: ^1.2.0
 
 dev_dependencies:
   flutter_test:

diff --git a/flutter_inappwebview_ios/CHANGELOG.md b/flutter_inappwebview_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.1
+
+- Updated flutter_inappwebview_platform_interface version to ^1.2.0
+
 ## 1.1.0+3
 
 - Updated flutter_inappwebview_platform_interface version

diff --git a/flutter_inappwebview_ios/pubspec.yaml b/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+3
+version: 1.1.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
@@ -20,7 +20,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.1.1
+  flutter_inappwebview_platform_interface: ^1.2.0
 
 dev_dependencies:
   flutter_test:

diff --git a/flutter_inappwebview_macos/CHANGELOG.md b/flutter_inappwebview_macos/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.1
+
+- Updated flutter_inappwebview_platform_interface version to ^1.2.0
+
 ## 1.1.0+3
 
 - Updated flutter_inappwebview_platform_interface version

diff --git a/flutter_inappwebview_macos/pubspec.yaml b/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+3
+version: 1.1.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
@@ -20,7 +20,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.1.1
+  flutter_inappwebview_platform_interface: ^1.2.0
 
 dev_dependencies:
   flutter_test:

diff --git a/flutter_inappwebview_web/CHANGELOG.md b/flutter_inappwebview_web/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.1
+
+- Updated flutter_inappwebview_platform_interface version to ^1.2.0
+
 ## 1.1.0+2
 
 - Updated flutter_inappwebview_platform_interface version

diff --git a/flutter_inappwebview_web/pubspec.yaml b/flutter_inappwebview_web/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_inappwebview_web
 description: Web implementation of the flutter_inappwebview plugin.
-version: 1.1.0+2
+version: 1.1.1
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_web
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -23,7 +23,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   web: ^1.0.0
-  flutter_inappwebview_platform_interface: ^1.1.1
+  flutter_inappwebview_platform_interface: ^1.2.0
 
 dev_dependencies:
   flutter_test:

diff --git a/flutter_inappwebview_windows/CHANGELOG.md b/flutter_inappwebview_windows/CHANGELOG.md
@@ -5,6 +5,7 @@
 ## 0.4.0
 
 - Updated `shouldOverrideUrlLoading` implementation using the Chrome DevTools Protocol API Fetch.requestPaused event
+- Updated flutter_inappwebview_platform_interface version to ^1.2.0
 
 ## 0.3.0+1
 

diff --git a/package.json b/package.json
@@ -1,29 +1,36 @@
 {
   "name": "flutter_inappwebview",
   "version": "1.0.0",
-  "directories": {
-    "example": "flutter_inappwebview/example",
-    "lib": "flutter_inappwebview/lib"
-  },
   "private": true,
   "scripts": {
-    "build": ".fvm/flutter_sdk/bin/flutter pub run build_runner build --delete-conflicting-outputs",
-    "watch": ".fvm/flutter_sdk/bin/flutter pub run build_runner watch --delete-conflicting-outputs",
+    "build": "cd flutter_inappwebview_platform_interface && ../.fvm/flutter_sdk/bin/flutter pub run build_runner build --delete-conflicting-outputs",
+    "watch": "cd flutter_inappwebview_platform_interface && ../.fvm/flutter_sdk/bin/flutter pub run build_runner watch --delete-conflicting-outputs",
+
     "publish:dry": ".fvm/flutter_sdk/bin/flutter pub publish --dry-run",
-    "publish": ".fvm/flutter_sdk/bin/flutter pub publish",
     "format": ".fvm/flutter_sdk/bin/dart format flutter_inappwebview/lib flutter_inappwebview/example/integration_test flutter_inappwebview_platform_interface/lib flutter_inappwebview_android/lib flutter_inappwebview_ios/lib flutter_inappwebview_macos/lib  flutter_inappwebview_web/lib  flutter_inappwebview_windows/lib",
-    "build:publish": "npm run format && npm run build && .fvm/flutter_sdk/bin/flutter pub publish",
-    "docs:gen": ".fvm/flutter_sdk/bin/dart doc",
-    "docs:serve": ".fvm/flutter_sdk/bin/flutter pub global activate dhttpd && .fvm/flutter_sdk/bin/flutter pub global run dhttpd:dhttpd --path doc/api"
+
+    "docs:gen": "cd flutter_inappwebview && ../.fvm/flutter_sdk/bin/dart doc ../",
+    "docs:serve": ".fvm/flutter_sdk/bin/flutter pub global activate dhttpd && .fvm/flutter_sdk/bin/flutter pub global run dhttpd:dhttpd --path doc/api",
+
+    "publish:platform_interface": "cd flutter_inappwebview_platform_interface && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..",
+    "publish:android": "cd flutter_inappwebview_android && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..",
+    "publish:ios": "cd flutter_inappwebview_ios && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..",
+    "publish:macos": "cd flutter_inappwebview_macos && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..",
+    "publish:web": "cd flutter_inappwebview_web && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..",
+    "publish:windows": "cd flutter_inappwebview_windows && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..",
+    "publish:all_platforms": "npm run publish:android && npm run publish:ios && npm run publish:macos && npm run publish:web && npm run publish:windows",
+    "publish:interface_and_all_platforms": "npm run publish:platform_interface && npm run publish:all_platforms",
+
+    "publish:plugin": "cd flutter_inappwebview && ../.fvm/flutter_sdk/bin/flutter pub publish && cd .."
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/pichillilorenzo/flutter_inappwebview.git"
   },
-  "author": "",
+  "author": "Lorenzo Pichilli",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/pichillilorenzo/flutter_inappwebview/issues"
   },
-  "homepage": "https://github.com/pichillilorenzo/flutter_inappwebview#readme"
+  "homepage": "https://github.com/pichillilorenzo/flutter_inappwebview#README.md"
 }