Skip to content

Commit 1295583

Browse files
committed
update support Xcode16
1 parent b798813 commit 1295583

File tree

4 files changed

+41
-31
lines changed

4 files changed

+41
-31
lines changed

android/app/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,13 @@ android {
8181
jvmTarget = '17'
8282
}
8383

84-
///为了 https://github.com/pichillilorenzo/flutter_inappwebview/issues/2150
84+
8585
configurations.all {
8686
resolutionStrategy {
87+
///为了 https://github.com/pichillilorenzo/flutter_inappwebview/issues/2150
8788
force 'androidx.webkit:webkit:1.8.0'
89+
///为了 Failed to transform appcompat-resources-1.7.0.aar
90+
//force "androidx.appcompat:appcompat:1.6.1"
8891
}
8992
}
9093
}

ios/Podfile.lock

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ PODS:
88
- flutter_inappwebview_ios (0.0.1):
99
- Flutter
1010
- flutter_inappwebview_ios/Core (= 0.0.1)
11-
- OrderedSet (~> 5.0)
11+
- OrderedSet (~> 6.0.3)
1212
- flutter_inappwebview_ios/Core (0.0.1):
1313
- Flutter
14-
- OrderedSet (~> 5.0)
14+
- OrderedSet (~> 6.0.3)
1515
- fluttertoast (0.0.2):
1616
- Flutter
1717
- Toast
18-
- OrderedSet (5.0.0)
18+
- OrderedSet (6.0.3)
1919
- package_info_plus (0.4.5):
2020
- Flutter
2121
- path_provider_foundation (0.0.1):
@@ -33,7 +33,7 @@ PODS:
3333
- sqflite (0.0.3):
3434
- Flutter
3535
- FlutterMacOS
36-
- Toast (4.0.0)
36+
- Toast (4.1.1)
3737
- url_launcher_ios (0.0.1):
3838
- Flutter
3939
- webview_flutter_wkwebview (0.0.1):
@@ -56,10 +56,9 @@ DEPENDENCIES:
5656
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
5757

5858
SPEC REPOS:
59-
https://github.com/CocoaPods/Specs.git:
60-
- Toast
6159
trunk:
6260
- OrderedSet
61+
- Toast
6362

6463
EXTERNAL SOURCES:
6564
connectivity_plus:
@@ -95,17 +94,17 @@ SPEC CHECKSUMS:
9594
connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
9695
device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
9796
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
98-
flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
97+
flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
9998
fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
100-
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
99+
OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
101100
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
102101
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
103102
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
104103
rive_common: cbbac3192af00d7341f19dae2f26298e9e37d99e
105104
share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
106105
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
107106
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
108-
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
107+
Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
109108
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
110109
webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
111110

pubspec.lock

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ packages:
320320
dependency: "direct main"
321321
description:
322322
name: flutter_inappwebview
323-
sha256: "3e9a443a18ecef966fb930c3a76ca5ab6a7aafc0c7b5e14a4a850cf107b09959"
323+
sha256: bdfcf87dd49e1bd036781e308cfde61e258749852ba5e337c6128670b4428fda
324324
url: "https://pub.flutter-io.cn"
325325
source: hosted
326-
version: "6.0.0"
326+
version: "6.1.0+1"
327327
flutter_inappwebview_android:
328328
dependency: "direct overridden"
329329
description:
@@ -345,34 +345,42 @@ packages:
345345
dependency: transitive
346346
description:
347347
name: flutter_inappwebview_ios
348-
sha256: f363577208b97b10b319cd0c428555cd8493e88b468019a8c5635a0e4312bd0f
348+
sha256: "9b2a9ded585581898692a21e0c501dccab7c6d48b936b9fc1bbdd6d9fe9df3e6"
349349
url: "https://pub.flutter-io.cn"
350350
source: hosted
351-
version: "1.0.13"
351+
version: "1.1.0+1"
352352
flutter_inappwebview_macos:
353353
dependency: transitive
354354
description:
355355
name: flutter_inappwebview_macos
356-
sha256: b55b9e506c549ce88e26580351d2c71d54f4825901666bd6cfa4be9415bb2636
356+
sha256: "3c08e27e1471834037d5015b55560e42ad44e15502646198a0e64d54bcc3ba26"
357357
url: "https://pub.flutter-io.cn"
358358
source: hosted
359-
version: "1.0.11"
359+
version: "1.1.0+1"
360360
flutter_inappwebview_platform_interface:
361361
dependency: transitive
362362
description:
363363
name: flutter_inappwebview_platform_interface
364-
sha256: "545fd4c25a07d2775f7d5af05a979b2cac4fbf79393b0a7f5d33ba39ba4f6187"
364+
sha256: "491281ff6c15b205f04e4c11df4af23245a5b2cb1aa70113f6f42a1296836559"
365365
url: "https://pub.flutter-io.cn"
366366
source: hosted
367-
version: "1.0.10"
367+
version: "1.1.0"
368368
flutter_inappwebview_web:
369369
dependency: transitive
370370
description:
371371
name: flutter_inappwebview_web
372-
sha256: d8c680abfb6fec71609a700199635d38a744df0febd5544c5a020bd73de8ee07
372+
sha256: "926523a83e1a3318ef2798a5b2589b70d568ae1de53f9b011794ea90984859ad"
373373
url: "https://pub.flutter-io.cn"
374374
source: hosted
375-
version: "1.0.8"
375+
version: "1.1.0"
376+
flutter_inappwebview_windows:
377+
dependency: transitive
378+
description:
379+
name: flutter_inappwebview_windows
380+
sha256: "2c1c13c32835c4a0afa49aabc207cd5cf80967c00bfdfe49259d082182d7c81f"
381+
url: "https://pub.flutter-io.cn"
382+
source: hosted
383+
version: "0.1.0"
376384
flutter_lints:
377385
dependency: "direct dev"
378386
description:
@@ -811,10 +819,10 @@ packages:
811819
dependency: transitive
812820
description:
813821
name: permission_handler_html
814-
sha256: "6cac773d389e045a8d4f85418d07ad58ef9e42a56e063629ce14c4c26344de24"
822+
sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
815823
url: "https://pub.flutter-io.cn"
816824
source: hosted
817-
version: "0.1.2"
825+
version: "0.1.3+2"
818826
permission_handler_platform_interface:
819827
dependency: transitive
820828
description:
@@ -907,18 +915,18 @@ packages:
907915
dependency: "direct main"
908916
description:
909917
name: rive
910-
sha256: b45de4f0053e380302a7c37c0e7c7e734127d238eed23a85fe3a4b0b6faa8a5a
918+
sha256: daa5394a7d064b4997b39e9afa02f6882c479c38b19fa0dd60f052b99c105400
911919
url: "https://pub.flutter-io.cn"
912920
source: hosted
913-
version: "0.13.12"
921+
version: "0.13.13"
914922
rive_common:
915923
dependency: transitive
916924
description:
917925
name: rive_common
918-
sha256: "77311538b149263d34dc29cde4e608953c2d4451233efdb874ea9f08910769ac"
926+
sha256: c7bf0781b1621629361579c300ac2f8aa1a238227a242202a596e82becc244d7
919927
url: "https://pub.flutter-io.cn"
920928
source: hosted
921-
version: "0.4.10"
929+
version: "0.4.11"
922930
rxdart:
923931
dependency: "direct main"
924932
description:
@@ -1272,10 +1280,10 @@ packages:
12721280
dependency: transitive
12731281
description:
12741282
name: web
1275-
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
1283+
sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
12761284
url: "https://pub.flutter-io.cn"
12771285
source: hosted
1278-
version: "0.5.1"
1286+
version: "1.1.0"
12791287
web_socket_channel:
12801288
dependency: transitive
12811289
description:
@@ -1358,4 +1366,4 @@ packages:
13581366
version: "3.1.2"
13591367
sdks:
13601368
dart: ">=3.5.0 <4.0.0"
1361-
flutter: ">=3.22.0"
1369+
flutter: ">=3.24.0"

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ dependencies:
4545
path_provider: 2.1.4
4646
webview_flutter: 4.8.0
4747
# 高版本目前和👆兼容有问题
48-
flutter_inappwebview: 6.0.0
48+
flutter_inappwebview: 6.1.0+1
4949
#bezier: ^1.1.5
5050
flare_flutter:
5151
git:
5252
url: https://gitee.com/CarGuo/Flare-Flutter.git
5353
ref: ab41281006402485ff7326d0c58134f451a0de3a
5454
path: flare_flutter/
5555

56-
rive: 0.13.12
56+
rive: 0.13.13
5757
# 固定版本
5858
flutter_redux: 0.10.0
5959
rxdart: 0.27.1

0 commit comments

Comments
 (0)