diff --git a/android/app/build.gradle b/android/app/build.gradle index 12896d04..b36888f9 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,10 +81,13 @@ android { jvmTarget = '17' } - ///为了 https://github.com/pichillilorenzo/flutter_inappwebview/issues/2150 + configurations.all { resolutionStrategy { + ///为了 https://github.com/pichillilorenzo/flutter_inappwebview/issues/2150 force 'androidx.webkit:webkit:1.8.0' + ///为了 Failed to transform appcompat-resources-1.7.0.aar + //force "androidx.appcompat:appcompat:1.6.1" } } } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 39b67097..1b4623be 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -8,14 +8,14 @@ PODS: - flutter_inappwebview_ios (0.0.1): - Flutter - flutter_inappwebview_ios/Core (= 0.0.1) - - OrderedSet (~> 5.0) + - OrderedSet (~> 6.0.3) - flutter_inappwebview_ios/Core (0.0.1): - Flutter - - OrderedSet (~> 5.0) + - OrderedSet (~> 6.0.3) - fluttertoast (0.0.2): - Flutter - Toast - - OrderedSet (5.0.0) + - OrderedSet (6.0.3) - package_info_plus (0.4.5): - Flutter - path_provider_foundation (0.0.1): @@ -33,7 +33,7 @@ PODS: - sqflite (0.0.3): - Flutter - FlutterMacOS - - Toast (4.0.0) + - Toast (4.1.1) - url_launcher_ios (0.0.1): - Flutter - webview_flutter_wkwebview (0.0.1): @@ -56,10 +56,9 @@ DEPENDENCIES: - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) SPEC REPOS: - https://github.com/CocoaPods/Specs.git: - - Toast trunk: - OrderedSet + - Toast EXTERNAL SOURCES: connectivity_plus: @@ -95,9 +94,9 @@ SPEC CHECKSUMS: connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0 + flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4 fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c - OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c + OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 @@ -105,7 +104,7 @@ SPEC CHECKSUMS: share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028 shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec - Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 + Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1 diff --git a/pubspec.lock b/pubspec.lock index be4f08b6..7d71669e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -320,10 +320,10 @@ packages: dependency: "direct main" description: name: flutter_inappwebview - sha256: "3e9a443a18ecef966fb930c3a76ca5ab6a7aafc0c7b5e14a4a850cf107b09959" + sha256: bdfcf87dd49e1bd036781e308cfde61e258749852ba5e337c6128670b4428fda url: "https://pub.flutter-io.cn" source: hosted - version: "6.0.0" + version: "6.1.0+1" flutter_inappwebview_android: dependency: "direct overridden" description: @@ -345,34 +345,42 @@ packages: dependency: transitive description: name: flutter_inappwebview_ios - sha256: f363577208b97b10b319cd0c428555cd8493e88b468019a8c5635a0e4312bd0f + sha256: "9b2a9ded585581898692a21e0c501dccab7c6d48b936b9fc1bbdd6d9fe9df3e6" url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.13" + version: "1.1.0+1" flutter_inappwebview_macos: dependency: transitive description: name: flutter_inappwebview_macos - sha256: b55b9e506c549ce88e26580351d2c71d54f4825901666bd6cfa4be9415bb2636 + sha256: "3c08e27e1471834037d5015b55560e42ad44e15502646198a0e64d54bcc3ba26" url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.11" + version: "1.1.0+1" flutter_inappwebview_platform_interface: dependency: transitive description: name: flutter_inappwebview_platform_interface - sha256: "545fd4c25a07d2775f7d5af05a979b2cac4fbf79393b0a7f5d33ba39ba4f6187" + sha256: "491281ff6c15b205f04e4c11df4af23245a5b2cb1aa70113f6f42a1296836559" url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.10" + version: "1.1.0" flutter_inappwebview_web: dependency: transitive description: name: flutter_inappwebview_web - sha256: d8c680abfb6fec71609a700199635d38a744df0febd5544c5a020bd73de8ee07 + sha256: "926523a83e1a3318ef2798a5b2589b70d568ae1de53f9b011794ea90984859ad" url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.8" + version: "1.1.0" + flutter_inappwebview_windows: + dependency: transitive + description: + name: flutter_inappwebview_windows + sha256: "2c1c13c32835c4a0afa49aabc207cd5cf80967c00bfdfe49259d082182d7c81f" + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.1.0" flutter_lints: dependency: "direct dev" description: @@ -811,10 +819,10 @@ packages: dependency: transitive description: name: permission_handler_html - sha256: "6cac773d389e045a8d4f85418d07ad58ef9e42a56e063629ce14c4c26344de24" + sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851 url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.2" + version: "0.1.3+2" permission_handler_platform_interface: dependency: transitive description: @@ -907,18 +915,18 @@ packages: dependency: "direct main" description: name: rive - sha256: b45de4f0053e380302a7c37c0e7c7e734127d238eed23a85fe3a4b0b6faa8a5a + sha256: daa5394a7d064b4997b39e9afa02f6882c479c38b19fa0dd60f052b99c105400 url: "https://pub.flutter-io.cn" source: hosted - version: "0.13.12" + version: "0.13.13" rive_common: dependency: transitive description: name: rive_common - sha256: "77311538b149263d34dc29cde4e608953c2d4451233efdb874ea9f08910769ac" + sha256: c7bf0781b1621629361579c300ac2f8aa1a238227a242202a596e82becc244d7 url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.10" + version: "0.4.11" rxdart: dependency: "direct main" description: @@ -1272,10 +1280,10 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.flutter-io.cn" source: hosted - version: "0.5.1" + version: "1.1.0" web_socket_channel: dependency: transitive description: @@ -1358,4 +1366,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.0 <4.0.0" - flutter: ">=3.22.0" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index b3b524cf..3673a002 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,7 +45,7 @@ dependencies: path_provider: 2.1.4 webview_flutter: 4.8.0 # 高版本目前和👆兼容有问题 - flutter_inappwebview: 6.0.0 + flutter_inappwebview: 6.1.0+1 #bezier: ^1.1.5 flare_flutter: git: @@ -53,7 +53,7 @@ dependencies: ref: ab41281006402485ff7326d0c58134f451a0de3a path: flare_flutter/ - rive: 0.13.12 + rive: 0.13.13 # 固定版本 flutter_redux: 0.10.0 rxdart: 0.27.1